diff options
| author | Ying Wang <wangying@google.com> | 2010-12-28 16:40:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-28 16:40:01 -0800 |
| commit | 3886c39db8191fdcd93860899615abd25ca42868 (patch) | |
| tree | 2d62b8cf0c781bca6868fb869baf6c29e2184a61 | |
| parent | da26ee31267fcdb680cb71be5940941244014606 (diff) | |
| parent | 8b07ed87fac07337f82f96613aa4e3f6170b279b (diff) | |
| download | build-3886c39db8191fdcd93860899615abd25ca42868.zip build-3886c39db8191fdcd93860899615abd25ca42868.tar.gz build-3886c39db8191fdcd93860899615abd25ca42868.tar.bz2 | |
Merge "LOCAL_AAPT_INCLUDE_ALL_RESOURCES"
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/package.mk | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 5c4dbea..ca70c55 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -44,6 +44,7 @@ LOCAL_C_INCLUDES:= LOCAL_LDFLAGS:= LOCAL_LDLIBS:= LOCAL_AAPT_FLAGS:= +LOCAL_AAPT_INCLUDE_ALL_RESOURCES:= LOCAL_SYSTEM_SHARED_LIBRARIES:=none LOCAL_PREBUILT_LIBS:= LOCAL_PREBUILT_EXECUTABLES:= diff --git a/core/package.mk b/core/package.mk index f8be8a7..4033f8d 100644 --- a/core/package.mk +++ b/core/package.mk @@ -331,6 +331,9 @@ $(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries) $(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abi) ifneq ($(TARGET_BUILD_APPS),) # Include all resources for unbundled apps. + LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true +endif +ifeq ($(LOCAL_AAPT_INCLUDE_ALL_RESOURCES),true) $(LOCAL_BUILT_MODULE): PRODUCT_AAPT_CONFIG := endif $(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest) |