From 723eed5f6282da5d5d2e88f8d52bd289738c8ca0 Mon Sep 17 00:00:00 2001 From: Clinton Ebadi Date: Mon, 5 Oct 2009 14:04:39 -0400 Subject: [PATCH 3/3] Don't require resource localization This is fine for the core google apps, but breaks a lot of external apps. --- core/definitions.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index 9b3a03d..20309cf 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1158,7 +1158,7 @@ endef define create-resource-java-files @mkdir -p $(PRIVATE_SOURCE_INTERMEDIATES_DIR) @mkdir -p $(dir $(PRIVATE_RESOURCE_PUBLICS_OUTPUT)) -$(hide) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m -z \ +$(hide) $(AAPT) package $(PRIVATE_AAPT_FLAGS) -m \ $(eval # PRODUCT_AAPT_CONFIG is intentionally missing-- see comment.) \ $(addprefix -J , $(PRIVATE_SOURCE_INTERMEDIATES_DIR)) \ $(addprefix -M , $(PRIVATE_ANDROID_MANIFEST)) \ @@ -1301,7 +1301,7 @@ endef #values; applications can override these by explicitly stating #them in their manifest. define add-assets-to-package -$(hide) $(AAPT) package -z -u $(PRIVATE_AAPT_FLAGS) \ +$(hide) $(AAPT) package -u $(PRIVATE_AAPT_FLAGS) \ $(addprefix -c , $(PRODUCT_AAPT_CONFIG)) \ $(addprefix -M , $(PRIVATE_ANDROID_MANIFEST)) \ $(addprefix -S , $(PRIVATE_RESOURCE_DIR)) \ -- 1.6.4.3