diff options
| author | Colin Cross <ccross@android.com> | 2015-04-27 16:30:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-29 13:32:56 -0700 |
| commit | a8bbf9bd1959b86b3932d6b639e5ca713f36f0ff (patch) | |
| tree | b8616ba4639cff7f57934817a37c8716343b9125 | |
| parent | 77c78707c941c7942602c2658a51e464ec36741d (diff) | |
| download | base-a8bbf9bd1959b86b3932d6b639e5ca713f36f0ff.tar.gz | |
Update Blueprints for AOSP changes
Change-Id: I4de97a34f2650f2355721a2d80dad1e75db958f6
| -rw-r--r-- | Blueprints | 1 | ||||
| -rw-r--r-- | libs/androidfw/Blueprints | 5 | ||||
| -rw-r--r-- | libs/androidfw/tests/Blueprints | 3 | ||||
| -rw-r--r-- | tools/aapt/Blueprints | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/Blueprints b/Blueprints index e44b413d3fe6..c66e752d8aae 100644 --- a/Blueprints +++ b/Blueprints @@ -210,6 +210,7 @@ java_library { "core/java/android/os/INetworkActivityListener.aidl", "core/java/android/os/INetworkManagementService.aidl", "core/java/android/os/IPermissionController.aidl", + "core/java/android/os/IProcessInfoService.aidl", "core/java/android/os/IPowerManager.aidl", "core/java/android/os/IRemoteCallback.aidl", "core/java/android/os/ISchedulingPolicyService.aidl", diff --git a/libs/androidfw/Blueprints b/libs/androidfw/Blueprints index 0efb209645b4..d06738749344 100644 --- a/libs/androidfw/Blueprints +++ b/libs/androidfw/Blueprints @@ -49,7 +49,10 @@ cc_library { "external/zlib", "system/core/include", ], - static_libs: ["libziparchive"], + static_libs: [ + "libziparchive", + "libbase", + ], shared_libs: [ "liblog", "libcutils", diff --git a/libs/androidfw/tests/Blueprints b/libs/androidfw/tests/Blueprints index 65874010d27b..e202f934998b 100644 --- a/libs/androidfw/tests/Blueprints +++ b/libs/androidfw/tests/Blueprints @@ -25,6 +25,8 @@ cc_test { "-Werror", "-Wunused", "-Wunreachable-code", + "-Wno-missing-field-initializers", + // gtest is broken "-Wno-unnamed-type-template-args", ], @@ -60,6 +62,7 @@ cc_test { "libutils", "libcutils", "liblog", + "libz", ], }, }, diff --git a/tools/aapt/Blueprints b/tools/aapt/Blueprints index ee1834289d52..c9254b770b6c 100644 --- a/tools/aapt/Blueprints +++ b/tools/aapt/Blueprints @@ -139,6 +139,7 @@ cc_binary { "libcutils", "libexpat", "libziparchive", + "libbase", ], }, android: { @@ -174,6 +175,7 @@ cc_test_host { "libcutils", "libexpat", "libziparchive", + "libbase", ], target: { not_windows: { |