diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/definitions.mk | 7 | ||||
| -rw-r--r-- | core/main.mk | 5 | ||||
| -rw-r--r-- | core/package.mk | 12 | ||||
| -rw-r--r-- | core/product.mk | 1 | ||||
| -rw-r--r-- | core/product_config.mk | 4 |
5 files changed, 20 insertions, 9 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 1a7cf4b..4e3a204 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1586,10 +1586,9 @@ endef define add-dex-to-package $(if $(filter classes.dex,$(notdir $(PRIVATE_DEX_FILE))),\ $(hide) $(AAPT) add -k $@ $(PRIVATE_DEX_FILE),\ -$(eval _adtp_classes.dex := $(dir $(PRIVATE_DEX_FILE))/classes.dex)\ -$(hide) cp $(PRIVATE_DEX_FILE) $(_adtp_classes.dex) && \ -$(AAPT) add -k $@ $(_adtp_classes.dex) && \ -rm -f $(_adtp_classes.dex)) +$(hide) _adtp_classes_dex=$(dir $(PRIVATE_DEX_FILE))classes.dex; \ +cp $(PRIVATE_DEX_FILE) $$_adtp_classes_dex && \ +$(AAPT) add -k $@ $$_adtp_classes_dex && rm -f $$_adtp_classes_dex) endef define add-java-resources-to-package diff --git a/core/main.mk b/core/main.mk index 6841b36..5f01238 100644 --- a/core/main.mk +++ b/core/main.mk @@ -664,6 +664,11 @@ ifdef is_sdk_build $(info Removing from sdk:)$(foreach d,$(target_gnu_MODULES),$(info : $(d))) modules_to_install := \ $(filter-out $(target_gnu_MODULES),$(modules_to_install)) + + # Ensure every module listed in PRODUCT_PACKAGES gets something installed + $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ + $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ + $(error Module '$(m)' in PRODUCT_PACKAGES has nothing to install!))) endif diff --git a/core/package.mk b/core/package.mk index 07cdbd0..c60558c 100644 --- a/core/package.mk +++ b/core/package.mk @@ -290,6 +290,18 @@ jni_shared_libraries := \ $(addsuffix $(so_suffix), \ $(LOCAL_JNI_SHARED_LIBRARIES))) +# App explicitly requires the prebuilt NDK libstlport_shared.so. +# libstlport_shared.so should never go to the system image. +# Instead it should be packaged into the apk. +ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT)) +ifndef LOCAL_NDK_VERSION +$(error LOCAL_NDK_VERSION has to be defined together with LOCAL_NDK_STL_VARIANT, \ + LOCAL_PACKAGE_NAME=$(LOCAL_PACKAGE_NAME)) +endif +jni_shared_libraries += \ + $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/sources/cxx-stl/stlport/libs/$(TARGET_CPU_ABI)/libstlport_shared.so +endif + # Set the abi directory used by the local JNI shared libraries. # (Doesn't change how the local shared libraries are compiled, just # sets where they are stored in the apk.) diff --git a/core/product.mk b/core/product.mk index 0ab9ae0..26f365d 100644 --- a/core/product.mk +++ b/core/product.mk @@ -77,7 +77,6 @@ _product_var_list := \ PRODUCT_EXTRA_RECOVERY_KEYS \ PRODUCT_PACKAGE_OVERLAYS \ DEVICE_PACKAGE_OVERLAYS \ - PRODUCT_CONTRIBUTORS_FILE \ PRODUCT_TAGS \ PRODUCT_SDK_ADDON_NAME \ PRODUCT_SDK_ADDON_COPY_FILES \ diff --git a/core/product_config.mk b/core/product_config.mk index e063e42..c455723 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -286,10 +286,6 @@ endif PRODUCT_COPY_FILES := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES)) -# The HTML file containing the contributors to the project. -PRODUCT_CONTRIBUTORS_FILE := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CONTRIBUTORS_FILE)) - # A list of property assignments, like "key = value", with zero or more # whitespace characters on either side of the '='. PRODUCT_PROPERTY_OVERRIDES := \ |