ab6ec61251786bf6b4d0407db3bc28aeefcb55db |
|
23-Feb-2018 |
Anton Hansson <hansson@google.com> |
frameworks/base: Set LOCAL_SDK_VERSION where possible. This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: I4233b9091d9066c4fa69f3d24aaf367ea500f760
/frameworks/base/keystore/tests/Android.mk
|
b866307f99c35252dcb76e9269bb57d97c3c4b86 |
|
08-Dec-2017 |
Paul Duffin <paulduffin@google.com> |
Stop statically including legacy-android-test Statically including legacy-android-test leads to duplicate classes which causes build time problems (with Proguard) and runtime problems on older SDK versions. This change: * Stops statically including legacy-android-test. * Adds compile time dependencies on andoid.test.base, android.test.mock and android.test.runner where necessary. * Adds <uses-library android:name="android.test.runner"/> to any affected package to ensure that the classes that were included by legacy-android-test are still available at runtime. That also adds a dependency on android.test.base and android.test.mock. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * apct-tests/perftests/core/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CorePerfTests results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CorePerfTests's source depends on its classes and because of these changes they are no longer present on the compilation path. * core/tests/ConnectivityManagerTest/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because ConnectivityManagerTest's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in ConnectivityManagerTest results in duplicate classes which leads to build time and compile time issues. * core/tests/bandwidthtests/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because BandwidthTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in BandwidthTests results in duplicate classes which leads to build time and compile time issues. * core/tests/bluetoothtests/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because BluetoothTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in BluetoothTests results in duplicate classes which leads to build time and compile time issues. * core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in DownloadManagerTestApp results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because DownloadManagerTestApp's source depends on its classes and because of these changes they are no longer present on the compilation path. * core/tests/hosttests/test-apps/ExternalSharedPerms/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in ExternalSharedPermsTestApp results in duplicate classes which leads to build time and compile time issues. * core/tests/hosttests/test-apps/ExternalSharedPermsBT/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in ExternalSharedPermsBTTestApp results in duplicate classes which leads to build time and compile time issues. * core/tests/hosttests/test-apps/ExternalSharedPermsDiffKey/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in ExternalSharedPermsDiffKeyTestApp results in duplicate classes which leads to build time and compile time issues. * core/tests/hosttests/test-apps/ExternalSharedPermsFL/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in ExternalSharedPermsFLTestApp results in duplicate classes which leads to build time and compile time issues. * core/tests/notificationtests/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because NotificationStressTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in NotificationStressTests results in duplicate classes which leads to build time and compile time issues. * keystore/tests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in KeystoreTests results in duplicate classes which leads to build time and compile time issues. * media/mca/tests/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CameraEffectsTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CameraEffectsTests results in duplicate classes which leads to build time and compile time issues. * media/tests/MediaFrameworkTest/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because mediaframeworktest's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in mediaframeworktest results in duplicate classes which leads to build time and compile time issues. * nfc-extras/tests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in NfcExtrasTests results in duplicate classes which leads to build time and compile time issues. * packages/CarrierDefaultApp/tests/unit/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CarrierDefaultAppUnitTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CarrierDefaultAppUnitTests results in duplicate classes which leads to build time and compile time issues. * packages/ExtServices/tests/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because ExtServicesUnitTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in ExtServicesUnitTests results in duplicate classes which leads to build time and compile time issues. * packages/MtpDocumentsProvider/tests/Android.mk Added 'android.test.base' and 'android.test.mock' to LOCAL_JAVA_LIBRARIES because MtpDocumentsProviderTests's source depends on their classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in MtpDocumentsProviderTests results in duplicate classes which leads to build time and compile time issues. * packages/SettingsLib/tests/integ/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because SettingsLibTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in SettingsLibTests results in duplicate classes which leads to build time and compile time issues. * packages/SettingsProvider/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in SettingsProvider results in duplicate classes which leads to build time and compile time issues. * packages/SettingsProvider/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to SettingsProvider at runtime. * packages/Shell/tests/Android.mk Added 'android.test.base' and 'android.test.mock' to LOCAL_JAVA_LIBRARIES because ShellTests's source depends on their classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in ShellTests results in duplicate classes which leads to build time and compile time issues. * packages/SystemUI/shared/tests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in SystemUISharedLibTests results in duplicate classes which leads to build time and compile time issues. * packages/SystemUI/tests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in SystemUITests results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because SystemUITests's source depends on its classes and because of these changes they are no longer present on the compilation path. * packages/WAPPushManager/tests/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because WAPPushManagerTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in WAPPushManagerTests results in duplicate classes which leads to build time and compile time issues. * sax/tests/saxtests/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because FrameworksSaxTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in FrameworksSaxTests results in duplicate classes which leads to build time and compile time issues. * tests/BrowserPowerTest/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because BrowserPowerTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in BrowserPowerTests results in duplicate classes which leads to build time and compile time issues. * tests/CanvasCompare/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CanvasCompare's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CanvasCompare results in duplicate classes which leads to build time and compile time issues. * tests/CoreTests/android/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CoreTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CoreTests results in duplicate classes which leads to build time and compile time issues. * tests/DataIdleTest/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because DataIdleTest's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in DataIdleTest results in duplicate classes which leads to build time and compile time issues. * tests/FrameworkPerf/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because FrameworkPerf's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in FrameworkPerf results in duplicate classes which leads to build time and compile time issues. * tests/HierarchyViewerTest/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because HierarchyViewerTest's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in HierarchyViewerTest results in duplicate classes which leads to build time and compile time issues. * tests/ImfTest/tests/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because ImfTestTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in ImfTestTests results in duplicate classes which leads to build time and compile time issues. * tests/Internal/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in InternalTests results in duplicate classes which leads to build time and compile time issues. * tests/MemoryUsage/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because MemoryUsage's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in MemoryUsage results in duplicate classes which leads to build time and compile time issues. * tests/NetworkSecurityConfigTest/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because NetworkSecurityConfigTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in NetworkSecurityConfigTests results in duplicate classes which leads to build time and compile time issues. * tests/SoundTriggerTests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in SoundTriggerTests results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because SoundTriggerTests's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/SurfaceComposition/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in SurfaceComposition results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because SurfaceComposition's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/TtsTests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in TtsTests results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because TtsTests's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/WindowAnimationJank/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in WindowAnimationJank results in duplicate classes which leads to build time and compile time issues. * tests/permission/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because FrameworkPermissionTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in FrameworkPermissionTests results in duplicate classes which leads to build time and compile time issues. * tests/testables/tests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in TestablesTests results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' and 'android.test.mock' to LOCAL_JAVA_LIBRARIES because TestablesTests's source depends on their classes and because of these changes they are no longer present on the compilation path. Bug: 30188076 Test: make checkbuild Change-Id: Iacfc939c97415314366ed61c5f3b7aa1a40f0ec9
/frameworks/base/keystore/tests/Android.mk
|
852c8f121f2e502e1e8503bfc230dccb81b681d4 |
|
15-Nov-2017 |
Eran Messeri <eranm@google.com> |
DevicePolicyManager: Add key generation functionality. This is the crux of the Verified Access feature implementation: Adding the ability to generate KeyChain keys directly by the secure hardware, rather than installing software-generated keys into KeyChain. Add generateKeyPair to the DevicePolicyManager, which delegates key generation (via the DevicePolicyManagerService) to the KeyChainService. Design highlights: * The key generation is delegated via the DevicePolicyManagerService to check that only authorized callers request key generation in KeyChain. * KeyChainService performs the actual key generation so it owns the key in Keystore outright. * DevicePolicyManagerService then grants the calling app access to the Keystore key, so it can actually be used. * Loading the public/private key pair, as well as attestation certificate chain, is done in the client code (DevicePolicyManager) to save parceling / unparceling those objects across process boundaries twice (for no good reason). NOTE: The key attestation functionality (that includes Device ID) is missing/untested. Will be added in a follow-up CL as this one is quite big already. HIGHLIGHT FOR REVIEWERS: * API: New API in DevicePolicyManager. Bug: 63388672 Test: cts-tradefed run commandAndExit cts-dev -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement -l DEBUG; adb shell am instrument 'android.security.tests/android.support.test.runner.AndroidJUnitRunner' (After building the KeystoreTests target and installing the apk) Change-Id: I73762c9123f32a94d454ba4f8b533883b55c44cc
/frameworks/base/keystore/tests/Android.mk
|
91abf9f6e2c60b05377b2b82ea2a09fc25476e56 |
|
02-May-2017 |
Kenny Root <kroot@google.com> |
Delete obsolete and unused KeyStoreTests These depended on internal implementation details of Conscrypt that are changing. Delete these tests since they're not included in builds any more. Test: make checkbuild Change-Id: I6ddf832c30bcf49e940c55aa81534c3d987393fb
/frameworks/base/keystore/tests/Android.mk
|
ccb04450279c53eda250ac3e20b75cd07bcd1f7e |
|
10-Jan-2017 |
Paul Duffin <paulduffin@google.com> |
Prepare for removal of legacy-test from default targets In preparation for removing junit classes from the Android API the legacy-test target will be removed from the TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. (cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f) Bug: 30188076 Test: make checkbuild Merged-In: I13e88297731253420e4e5f5291d503f13a39a156 Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
/frameworks/base/keystore/tests/Android.mk
|
12e752225aa96888358294be0d725d499a1c9f03 |
|
24-Apr-2013 |
Kenny Root <kroot@google.com> |
Track change to JSSE provider Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
/frameworks/base/keystore/tests/Android.mk
|
802768dd86c4e8a933dbfbac2e9f1a1daa5f93fa |
|
22-Aug-2012 |
Kenny Root <kroot@google.com> |
Add ability to replace chain for PrivateKeyEntry For the AndroidKeyStore API, allow entries to have their certificate chain replaced without destroying the underlying PrivateKey. Since entries are backed by unexportable private keys, requiring them to be supplied again doesn't make sense and is impossible. Change-Id: I629ce2a625315c8d8020a082892650ac5eba22ae
/frameworks/base/keystore/tests/Android.mk
|
f35e9663d7bdae523953185b4ad6b6f9e8e7d6ca |
|
29-Sep-2009 |
Chung-yih Wang <cywang@google.com> |
Add unit test for the new keystore. Since we need to test the keystore with user system in order to test the reset(), password(), lock() and unlock(), we have to take advantage of the ActivityUnitTestCase to run the test with the user 'system'.
/frameworks/base/keystore/tests/Android.mk
|