diff options
| -rw-r--r-- | core/64_bit_blacklist.mk | 4 | ||||
| -rw-r--r-- | core/binary.mk | 38 | ||||
| -rw-r--r-- | core/clear_vars.mk | 14 | ||||
| -rw-r--r-- | core/executable.mk | 1 | ||||
| -rw-r--r-- | core/main.mk | 4 | ||||
| -rw-r--r-- | core/prebuilt.mk | 232 | ||||
| -rw-r--r-- | core/prebuilt_internal.mk | 217 | ||||
| -rw-r--r-- | target/product/embedded.mk | 2 |
8 files changed, 284 insertions, 228 deletions
diff --git a/core/64_bit_blacklist.mk b/core/64_bit_blacklist.mk index 71a5cf3..91abcdc 100644 --- a/core/64_bit_blacklist.mk +++ b/core/64_bit_blacklist.mk @@ -14,7 +14,6 @@ _64_bit_directory_blacklist += \ external/chromium-libpac \ external/chromium_org \ external/skia \ - external/v8 \ frameworks/webview \ # misc build errors @@ -28,13 +27,14 @@ _64_bit_directory_blacklist += \ frameworks/ml \ frameworks/opt \ frameworks/wilhelm \ + frameworks/native/cmds/idmap \ device/generic/goldfish/opengl \ device/generic/goldfish/camera \ # depends on libnl_2 _64_bit_directory_blacklist += \ external/android-clat \ - external/wpa_suplicant_8 + external/wpa_supplicant_8 \ # depends on frameworks/av _64_bit_directory_blacklist += \ diff --git a/core/binary.mk b/core/binary.mk index f4a7eae..90b317e 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -85,21 +85,37 @@ include $(BUILD_SYSTEM)/base_rules.mk # The following LOCAL_ variables will be modified in this file. # Because the same LOCAL_ variables may be used to define modules for both 1st arch and 2nd arch, # we can't modify them in place. -my_src_files := $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) -my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES) -my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) -my_shared_libraries := $(LOCAL_SHARED_LIBRARIES) $(LOCAL_SHARED_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) -my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32) -my_cflags := $(LOCAL_CFLAGS) $(LOCAL_CFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CFLAGS_$(my_32_64_bit_suffix)) +my_src_files := $(LOCAL_SRC_FILES) +my_static_libraries := $(LOCAL_STATIC_LIBRARIES) +my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES) +my_shared_libraries := $(LOCAL_SHARED_LIBRARIES) +my_cflags := $(LOCAL_CFLAGS) my_cppflags := $(LOCAL_CPPFLAGS) -my_ldflags := $(LOCAL_LDFLAGS) $(LOCAL_LDFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_LDFLAGS_$(my_32_64_bit_suffix)) -my_asflags := $(LOCAL_ASFLAGS) $(LOCAL_ASFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_ASFLAGS_$(my_32_64_bit_suffix)) +my_ldflags := $(LOCAL_LDFLAGS) +my_asflags := $(LOCAL_ASFLAGS) my_cc := $(LOCAL_CC) my_cxx := $(LOCAL_CXX) -my_c_includes := $(LOCAL_C_INCLUDES) $(LOCAL_C_INCLUDES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_C_INCLUDES_$(my_32_64_bit_suffix)) -my_generated_sources := $(LOCAL_GENERATED_SOURCES) $(LOCAL_GENERATED_SOURCES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) +my_c_includes := $(LOCAL_C_INCLUDES) +my_generated_sources := $(LOCAL_GENERATED_SOURCES) + +ifndef LOCAL_IS_HOST_MODULE +my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_IS_64_BIT),64,32) + +my_src_files += $(LOCAL_SRC_FILES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SRC_FILES_$(my_32_64_bit_suffix)) +my_shared_libraries += $(LOCAL_SHARED_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_SHARED_LIBRARIES_$(my_32_64_bit_suffix)) +my_cflags += $(LOCAL_CFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CFLAGS_$(my_32_64_bit_suffix)) +my_cppflags += $(LOCAL_CPPFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_CPPFLAGS_$(my_32_64_bit_suffix)) +my_ldflags += $(LOCAL_LDFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_LDFLAGS_$(my_32_64_bit_suffix)) +my_asflags += $(LOCAL_ASFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_ASFLAGS_$(my_32_64_bit_suffix)) +my_c_includes += $(LOCAL_C_INCLUDES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_C_INCLUDES_$(my_32_64_bit_suffix)) +my_generated_sources += $(LOCAL_GENERATED_SOURCES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_GENERATED_SOURCES_$(my_32_64_bit_suffix)) + +# arch-specific static libraries go first so that generic ones can depend on them +my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries) +my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries) my_cflags := $(filter-out $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_UNSUPPORTED_CFLAGS),$(my_cflags)) +endif # The real dependency will be added after all Android.mks are loaded and the install paths # of the shared libraries are determined. @@ -689,7 +705,7 @@ normal_objects := \ all_objects := $(normal_objects) $(gen_o_objects) -my_c_includes += $(TOPDIR)$(LOCAL_PATH) $(intermediates) +my_c_includes += $(TOPDIR)$(LOCAL_PATH) $(intermediates) $(generated_sources_dir) ifndef LOCAL_SDK_VERSION my_c_includes += $(JNI_H_INCLUDE) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index b55c96b..87c608a 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -156,6 +156,7 @@ LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN:= # arch specific variables LOCAL_SRC_FILES_$(TARGET_ARCH):= LOCAL_CFLAGS_$(TARGET_ARCH):= +LOCAL_CPPFLAGS_$(TARGET_ARCH):= LOCAL_C_INCLUDES_$(TARGET_ARCH):= LOCAL_ASFLAGS_$(TARGET_ARCH):= LOCAL_NO_CRT_$(TARGET_ARCH):= @@ -168,6 +169,7 @@ LOCAL_REQUIRED_MODULES_$(TARGET_ARCH):= ifdef TARGET_2ND_ARCH LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):= LOCAL_CFLAGS_$(TARGET_2ND_ARCH):= +LOCAL_CPPFLAGS_$(TARGET_2ND_ARCH):= LOCAL_C_INCLUDES_$(TARGET_2ND_ARCH):= LOCAL_ASFLAGS_$(TARGET_2ND_ARCH):= LOCAL_NO_CRT_$(TARGET_2ND_ARCH):= @@ -179,8 +181,20 @@ LOCAL_GENERATED_SOURCES_$(TARGET_2ND_ARCH):= LOCAL_REQUIRED_MODULES_$(TARGET_2ND_ARCH):= endif +LOCAL_SRC_FILES_32:= +LOCAL_SRC_FILES_64:= +LOCAL_SHARED_LIBRARIES_32:= +LOCAL_SHARED_LIBRARIES_64:= +LOCAL_STATIC_LIBRARIES_32:= +LOCAL_STATIC_LIBRARIES_64:= +LOCAL_WHOLE_STATIC_LIBRARIES_32:= +LOCAL_WHOLE_STATIC_LIBRARIES_64:= +LOCAL_GENERATED_SOURCES_32:= +LOCAL_GENERATED_SOURCES_64:= LOCAL_CFLAGS_32:= LOCAL_CFLAGS_64:= +LOCAL_CPPFLAGS_32:= +LOCAL_CPPFLAGS_64:= LOCAL_LDFLAGS_32:= LOCAL_LDFLAGS_64:= LOCAL_ASFLAGS_32:= diff --git a/core/executable.mk b/core/executable.mk index 899a02f..f798a45 100644 --- a/core/executable.mk +++ b/core/executable.mk @@ -10,7 +10,6 @@ endif endif LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := true - # check if primary arch is supported include $(BUILD_SYSTEM)/module_arch_supported.mk ifeq ($(my_module_arch_supported),true) diff --git a/core/main.mk b/core/main.mk index 36c2cae..f00e859 100644 --- a/core/main.mk +++ b/core/main.mk @@ -764,6 +764,10 @@ ifdef is_sdk_build $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ $(eval dangling_modules += $(m)))) + ifneq ($(TARGET_IS_64_BIT),true) + # We know those 64-bit modules don't exist in the 32-bit SDK build. + dangling_modules := $(filter-out %64,$(dangling_modules)) + endif ifneq ($(dangling_modules),) $(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!) endif diff --git a/core/prebuilt.mk b/core/prebuilt.mk index de0d92c..027c80a 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -6,221 +6,25 @@ ## ########################################################### -ifneq ($(LOCAL_PREBUILT_LIBS),) -$(error dont use LOCAL_PREBUILT_LIBS anymore LOCAL_PATH=$(LOCAL_PATH)) -endif -ifneq ($(LOCAL_PREBUILT_EXECUTABLES),) -$(error dont use LOCAL_PREBUILT_EXECUTABLES anymore LOCAL_PATH=$(LOCAL_PATH)) -endif -ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),) -$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH)) -endif - -ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32_BIT_ONLY),true|true) -# Build for TARGET_ARCH -LOCAL_2ND_ARCH_VAR_PREFIX := -else -# Build for TARGET_2ND_ARCH -LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) -endif - - -# Not much sense to check build prebuilts -LOCAL_DONT_CHECK_MODULE := true - -ifdef LOCAL_PREBUILT_MODULE_FILE -my_prebuilt_src_file := $(LOCAL_PREBUILT_MODULE_FILE) -else -my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES) -endif - ifdef LOCAL_IS_HOST_MODULE - my_prefix := HOST_ -else - my_prefix := TARGET_ -endif -ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)) - # Put the built targets of all shared libraries in a common directory - # to simplify the link line. - OVERRIDE_BUILT_MODULE_PATH := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES) -endif - -ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),) - prebuilt_module_is_a_library := true -else - prebuilt_module_is_a_library := -endif - -# Don't install static libraries by default. -ifndef LOCAL_UNINSTALLABLE_MODULE -ifeq (STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)) - LOCAL_UNINSTALLABLE_MODULE := true -endif -endif - -ifeq ($(LOCAL_STRIP_MODULE),true) - ifdef LOCAL_IS_HOST_MODULE - $(error Cannot strip host module LOCAL_PATH=$(LOCAL_PATH)) - endif - ifeq ($(filter SHARED_LIBRARIES EXECUTABLES,$(LOCAL_MODULE_CLASS)),) - $(error Can strip only shared libraries or executables LOCAL_PATH=$(LOCAL_PATH)) - endif - ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) - $(error Cannot strip scripts LOCAL_PATH=$(LOCAL_PATH)) - endif - include $(BUILD_SYSTEM)/dynamic_binary.mk - built_module := $(linked_module) -else # LOCAL_STRIP_MODULE not true - include $(BUILD_SYSTEM)/base_rules.mk - built_module := $(LOCAL_BUILT_MODULE) - -ifdef prebuilt_module_is_a_library -export_includes := $(intermediates)/export_includes -$(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(LOCAL_EXPORT_C_INCLUDE_DIRS) -$(export_includes) : $(LOCAL_MODULE_MAKEFILE) - @echo Export includes file: $< -- $@ - $(hide) mkdir -p $(dir $@) && rm -f $@ -ifdef LOCAL_EXPORT_C_INCLUDE_DIRS - $(hide) for d in $(PRIVATE_EXPORT_C_INCLUDE_DIRS); do \ - echo "-I $$d" >> $@; \ - done -else - $(hide) touch $@ -endif - -$(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes -endif # prebuilt_module_is_a_library - -# The real dependency will be added after all Android.mks are loaded and the install paths -# of the shared libraries are determined. -ifdef LOCAL_INSTALLED_MODULE -ifdef LOCAL_SHARED_LIBRARIES -$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES)) - -# We also need the LOCAL_BUILT_MODULE dependency, -# since we use -rpath-link which points to the built module's path. -built_shared_libraries := \ - $(addprefix $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \ - $(addsuffix $($(my_prefix)SHLIB_SUFFIX), \ - $(LOCAL_SHARED_LIBRARIES))) -$(LOCAL_BUILT_MODULE) : $(built_shared_libraries) -endif -endif - -endif # LOCAL_STRIP_MODULE not true - -PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) - -ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) - # The magic string "EXTERNAL" means this package will be signed with - # the default dev key throughout the build process, but we expect - # the final package to be signed with a different key. - # - # This can be used for packages where we don't have access to the - # keys, but want the package to be predexopt'ed. - LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) - PACKAGES.$(LOCAL_MODULE).EXTERNAL_KEY := 1 - - $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 - $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem -endif -ifeq ($(LOCAL_CERTIFICATE),) - ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) - # It is now a build error to add a prebuilt .apk without - # specifying a key for it. - $(error No LOCAL_CERTIFICATE specified for prebuilt "$(my_prebuilt_src_file)") - endif -else ifeq ($(LOCAL_CERTIFICATE),PRESIGNED) - # The magic string "PRESIGNED" means this package is already checked - # signed with its release key. - # - # By setting .CERTIFICATE but not .PRIVATE_KEY, this package will be - # mentioned in apkcerts.txt (with certificate set to "PRESIGNED") - # but the dexpreopt process will not try to re-sign the app. - PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED - PACKAGES := $(PACKAGES) $(LOCAL_MODULE) -else - # If this is not an absolute certificate, assign it to a generic one. - ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) - LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE) - endif - - PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 - PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem - PACKAGES := $(PACKAGES) $(LOCAL_MODULE) - - $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 - $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem -endif - -ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) - -# Disable dex-preopt of prebuilts to save space -LOCAL_DEX_PREOPT := false - -####################################### -# defines built_odex along with rule to install odex -include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk -####################################### -ifdef LOCAL_DEX_PREOPT -$(built_module): PRIVATE_DEX_PREOPT_IMAGE := $(LOCAL_DEX_PREOPT_IMAGE) -$(built_module): PRIVATE_DEX_LOCATION := $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE)) -$(built_module): PRIVATE_BUILT_ODEX := $(built_odex) -# Make sure the boot jars get dexpreopt-ed first -$(built_module) : $(DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT) -$(built_module) : $(DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS) -(built_module) : $(LOCAL_DEX_PREOPT_IMAGE) -# built_odex is byproduct of LOCAL_BUILT_MODULE without its own build recipe. -$(built_odex) : $(LOCAL_BUILT_MODULE) -endif # LOCAL_DEX_PREOPT -# Sign and align non-presigned .apks. -$(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR) - $(transform-prebuilt-to-target) -ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) - $(sign-package) -endif -ifdef LOCAL_DEX_PREOPT - $(call dexpreopt-one-file,$(PRIVATE_DEX_PREOPT_IMAGE),$@,$(PRIVATE_DEX_LOCATION),$(PRIVATE_BUILT_ODEX)) -endif - $(align-package) - -else # LOCAL_MODULE_CLASS != APPS -ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) -$(built_module) : $(my_prebuilt_src_file) - $(transform-prebuilt-to-target-strip-comments) -else -$(built_module) : $(my_prebuilt_src_file) | $(ACP) - $(transform-prebuilt-to-target) -ifneq ($(prebuilt_module_is_a_library),) - ifneq ($(LOCAL_IS_HOST_MODULE),) - $(transform-host-ranlib-copy-hack) - else - $(transform-ranlib-copy-hack) - endif -endif +include $(BUILD_SYSTEM)/prebuilt_internal.mk +else #!LOCAL_IS_HOST_MODULE +# check if primary arch is supported +include $(BUILD_SYSTEM)/module_arch_supported.mk +ifeq ($(my_module_arch_supported),true) +# primary arch is supported +include $(BUILD_SYSTEM)/prebuilt_internal.mk +else ifneq (,$(TARGET_2ND_ARCH)) +# check if secondary arch is supported +LOCAL_2ND_ARCH_VAR_PREFIX := $(TARGET_2ND_ARCH_VAR_PREFIX) +include $(BUILD_SYSTEM)/module_arch_supported.mk +ifeq ($(my_module_arch_supported),true) +# secondary arch is supported +include $(BUILD_SYSTEM)/prebuilt_internal.mk endif -endif # LOCAL_MODULE_CLASS != APPS - -ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) -# for target java libraries, the LOCAL_BUILT_MODULE is in a product-specific dir, -# while the deps should be in the common dir, so we make a copy in the common dir. -# For nonstatic library, $(common_javalib_jar) is the dependency file, -# while $(common_classes_jar) is used to link. -common_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/classes.jar -common_javalib_jar := $(dir $(common_classes_jar))javalib.jar - -$(common_classes_jar) : $(my_prebuilt_src_file) | $(ACP) - $(transform-prebuilt-to-target) - -$(common_javalib_jar) : $(common_classes_jar) | $(ACP) - $(transform-prebuilt-to-target) - -# make sure the classes.jar and javalib.jar are built before $(LOCAL_BUILT_MODULE) -$(built_module) : $(common_javalib_jar) -endif # TARGET JAVA_LIBRARIES - -$(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES) - -my_prebuilt_src_file := +endif # TARGET_2ND_ARCH +endif # !LOCAL_IS_HOST_MODULE LOCAL_2ND_ARCH_VAR_PREFIX := + +my_module_arch_supported := diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk new file mode 100644 index 0000000..18bddc5 --- /dev/null +++ b/core/prebuilt_internal.mk @@ -0,0 +1,217 @@ +########################################################### +## Standard rules for copying files that are prebuilt +## +## Additional inputs from base_rules.make: +## None. +## +########################################################### + +ifneq ($(LOCAL_PREBUILT_LIBS),) +$(error dont use LOCAL_PREBUILT_LIBS anymore LOCAL_PATH=$(LOCAL_PATH)) +endif +ifneq ($(LOCAL_PREBUILT_EXECUTABLES),) +$(error dont use LOCAL_PREBUILT_EXECUTABLES anymore LOCAL_PATH=$(LOCAL_PATH)) +endif +ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),) +$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH)) +endif + +# Not much sense to check build prebuilts +LOCAL_DONT_CHECK_MODULE := true + +ifdef LOCAL_PREBUILT_MODULE_FILE +my_prebuilt_src_file := $(LOCAL_PREBUILT_MODULE_FILE) +else +my_prebuilt_src_file := $(LOCAL_PATH)/$(LOCAL_SRC_FILES) +endif + +ifdef LOCAL_IS_HOST_MODULE + my_prefix := HOST_ +else + my_prefix := TARGET_ +endif +ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)) + # Put the built targets of all shared libraries in a common directory + # to simplify the link line. + OVERRIDE_BUILT_MODULE_PATH := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES) +endif + +ifneq ($(filter STATIC_LIBRARIES SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS)),) + prebuilt_module_is_a_library := true +else + prebuilt_module_is_a_library := +endif + +# Don't install static libraries by default. +ifndef LOCAL_UNINSTALLABLE_MODULE +ifeq (STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS)) + LOCAL_UNINSTALLABLE_MODULE := true +endif +endif + +ifeq ($(LOCAL_STRIP_MODULE),true) + ifdef LOCAL_IS_HOST_MODULE + $(error Cannot strip host module LOCAL_PATH=$(LOCAL_PATH)) + endif + ifeq ($(filter SHARED_LIBRARIES EXECUTABLES,$(LOCAL_MODULE_CLASS)),) + $(error Can strip only shared libraries or executables LOCAL_PATH=$(LOCAL_PATH)) + endif + ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) + $(error Cannot strip scripts LOCAL_PATH=$(LOCAL_PATH)) + endif + include $(BUILD_SYSTEM)/dynamic_binary.mk + built_module := $(linked_module) +else # LOCAL_STRIP_MODULE not true + include $(BUILD_SYSTEM)/base_rules.mk + built_module := $(LOCAL_BUILT_MODULE) + +ifdef prebuilt_module_is_a_library +export_includes := $(intermediates)/export_includes +$(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(LOCAL_EXPORT_C_INCLUDE_DIRS) +$(export_includes) : $(LOCAL_MODULE_MAKEFILE) + @echo Export includes file: $< -- $@ + $(hide) mkdir -p $(dir $@) && rm -f $@ +ifdef LOCAL_EXPORT_C_INCLUDE_DIRS + $(hide) for d in $(PRIVATE_EXPORT_C_INCLUDE_DIRS); do \ + echo "-I $$d" >> $@; \ + done +else + $(hide) touch $@ +endif + +$(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes +endif # prebuilt_module_is_a_library + +# The real dependency will be added after all Android.mks are loaded and the install paths +# of the shared libraries are determined. +ifdef LOCAL_INSTALLED_MODULE +ifdef LOCAL_SHARED_LIBRARIES +$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES)) + +# We also need the LOCAL_BUILT_MODULE dependency, +# since we use -rpath-link which points to the built module's path. +built_shared_libraries := \ + $(addprefix $($(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \ + $(addsuffix $($(my_prefix)SHLIB_SUFFIX), \ + $(LOCAL_SHARED_LIBRARIES))) +$(LOCAL_BUILT_MODULE) : $(built_shared_libraries) +endif +endif + +endif # LOCAL_STRIP_MODULE not true + +PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) + +ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) + # The magic string "EXTERNAL" means this package will be signed with + # the default dev key throughout the build process, but we expect + # the final package to be signed with a different key. + # + # This can be used for packages where we don't have access to the + # keys, but want the package to be predexopt'ed. + LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) + PACKAGES.$(LOCAL_MODULE).EXTERNAL_KEY := 1 + + $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 + $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem +endif +ifeq ($(LOCAL_CERTIFICATE),) + ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) + # It is now a build error to add a prebuilt .apk without + # specifying a key for it. + $(error No LOCAL_CERTIFICATE specified for prebuilt "$(my_prebuilt_src_file)") + endif +else ifeq ($(LOCAL_CERTIFICATE),PRESIGNED) + # The magic string "PRESIGNED" means this package is already checked + # signed with its release key. + # + # By setting .CERTIFICATE but not .PRIVATE_KEY, this package will be + # mentioned in apkcerts.txt (with certificate set to "PRESIGNED") + # but the dexpreopt process will not try to re-sign the app. + PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED + PACKAGES := $(PACKAGES) $(LOCAL_MODULE) +else + # If this is not an absolute certificate, assign it to a generic one. + ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) + LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE) + endif + + PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 + PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem + PACKAGES := $(PACKAGES) $(LOCAL_MODULE) + + $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 + $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem +endif + +ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) + +# Disable dex-preopt of prebuilts to save space +LOCAL_DEX_PREOPT := false + +####################################### +# defines built_odex along with rule to install odex +include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk +####################################### +ifdef LOCAL_DEX_PREOPT +$(built_module): PRIVATE_DEX_PREOPT_IMAGE := $(LOCAL_DEX_PREOPT_IMAGE) +$(built_module): PRIVATE_DEX_LOCATION := $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE)) +$(built_module): PRIVATE_BUILT_ODEX := $(built_odex) +# Make sure the boot jars get dexpreopt-ed first +$(built_module) : $(DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT) +$(built_module) : $(DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS) +(built_module) : $(LOCAL_DEX_PREOPT_IMAGE) +# built_odex is byproduct of LOCAL_BUILT_MODULE without its own build recipe. +$(built_odex) : $(LOCAL_BUILT_MODULE) +endif # LOCAL_DEX_PREOPT +# Sign and align non-presigned .apks. +$(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR) + $(transform-prebuilt-to-target) +ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) + $(sign-package) +endif +ifdef LOCAL_DEX_PREOPT + $(call dexpreopt-one-file,$(PRIVATE_DEX_PREOPT_IMAGE),$@,$(PRIVATE_DEX_LOCATION),$(PRIVATE_BUILT_ODEX)) +endif + $(align-package) + +else # LOCAL_MODULE_CLASS != APPS +ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) +$(built_module) : $(my_prebuilt_src_file) + $(transform-prebuilt-to-target-strip-comments) +else +$(built_module) : $(my_prebuilt_src_file) | $(ACP) + $(transform-prebuilt-to-target) +ifneq ($(prebuilt_module_is_a_library),) + ifneq ($(LOCAL_IS_HOST_MODULE),) + $(transform-host-ranlib-copy-hack) + else + $(transform-ranlib-copy-hack) + endif +endif +endif +endif # LOCAL_MODULE_CLASS != APPS + +ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) +# for target java libraries, the LOCAL_BUILT_MODULE is in a product-specific dir, +# while the deps should be in the common dir, so we make a copy in the common dir. +# For nonstatic library, $(common_javalib_jar) is the dependency file, +# while $(common_classes_jar) is used to link. +common_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/classes.jar +common_javalib_jar := $(dir $(common_classes_jar))javalib.jar + +$(common_classes_jar) : $(my_prebuilt_src_file) | $(ACP) + $(transform-prebuilt-to-target) + +$(common_javalib_jar) : $(common_classes_jar) | $(ACP) + $(transform-prebuilt-to-target) + +# make sure the classes.jar and javalib.jar are built before $(LOCAL_BUILT_MODULE) +$(built_module) : $(common_javalib_jar) +endif # TARGET JAVA_LIBRARIES + +$(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES) + +my_prebuilt_src_file := + +LOCAL_2ND_ARCH_VAR_PREFIX := diff --git a/target/product/embedded.mk b/target/product/embedded.mk index b0a5396..599f049 100644 --- a/target/product/embedded.mk +++ b/target/product/embedded.mk @@ -23,6 +23,7 @@ PRODUCT_PACKAGES += \ atrace \ bootanimation \ debuggerd \ + debuggerd64 \ dumpstate \ dumpsys \ gralloc.default \ @@ -59,6 +60,7 @@ PRODUCT_PACKAGES += \ libui \ libutils \ linker \ + linker64 \ lmkd \ logcat \ logwrapper \ |