diff options
| author | Nick Kralevich <nnk@google.com> | 2014-11-02 05:11:11 +0000 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-11-02 05:11:11 +0000 |
| commit | bcf8683b29d2c350c46f44a6f4241d80ec40e30e (patch) | |
| tree | ef843017555ceb7bdd6cfa4ae47497a6174950bb /core/package_internal.mk | |
| parent | f56729250448200834c5c95c86c937e887d73623 (diff) | |
| download | build-bcf8683b29d2c350c46f44a6f4241d80ec40e30e.tar.gz build-bcf8683b29d2c350c46f44a6f4241d80ec40e30e.tar.bz2 build-bcf8683b29d2c350c46f44a6f4241d80ec40e30e.zip | |
Revert "Add support for prebuilt AARs."
master doesn't compile anymore.
This reverts commit f56729250448200834c5c95c86c937e887d73623.
Change-Id: Icc16fe5360d1222740b803e9dd006081e3c66e46
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index e2c3cf46a..bb458d477 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -192,8 +192,6 @@ endif # LOCAL_EMMA_INSTRUMENT rs_compatibility_jni_libs := -include $(BUILD_SYSTEM)/android_manifest.mk - ################################# include $(BUILD_SYSTEM)/java.mk ################################# @@ -203,6 +201,8 @@ ifeq ($(LOCAL_SDK_RES_VERSION),) LOCAL_SDK_RES_VERSION:=$(LOCAL_SDK_VERSION) endif +include $(BUILD_SYSTEM)/android_manifest.mk + $(LOCAL_INTERMEDIATE_TARGETS): \ PRIVATE_ANDROID_MANIFEST := $(full_android_manifest) ifneq (,$(filter-out current system_current, $(LOCAL_SDK_VERSION))) |