Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9fbe64e authored by Dan Willemsen's avatar Dan Willemsen Committed by Automerger Merge Worker
Browse files

Merge "Remove obsolete PDK build functionality" into rvc-dev-plus-aosp am:... 

Merge "Remove obsolete PDK build functionality" into rvc-dev-plus-aosp am: 3d3cd8a6 am: c17252f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12347726

Change-Id: I6ec7720b0224b55a8b32f2d73e1ed66b75b3ab81
parents 8abf64c1 c17252f3

core/Makefile

+19 −167
Original line number Diff line number Diff line
@@ -553,12 +553,8 @@ event_log_tags_file := $(TARGET_OUT)/etc/event-log-tags 
all_event_log_tags_src := \

    $(sort $(foreach m, $(ALL_MODULES), $(ALL_MODULES.$(m).EVENT_LOG_TAGS)))



# PDK builds will already have a full list of tags that needs to get merged

# in with the ones from source

pdk_fusion_log_tags_file := $(patsubst $(PRODUCT_OUT)/%,$(_pdk_fusion_intermediates)/%,$(filter $(event_log_tags_file),$(ALL_PDK_FUSION_FILES)))



$(all_event_log_tags_file): PRIVATE_SRC_FILES := $(all_event_log_tags_src) $(pdk_fusion_log_tags_file)

$(all_event_log_tags_file): $(all_event_log_tags_src) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/make/tools/event_log_tags.py

$(all_event_log_tags_file): PRIVATE_SRC_FILES := $(all_event_log_tags_src)

$(all_event_log_tags_file): $(all_event_log_tags_src) $(MERGETAGS) build/make/tools/event_log_tags.py

	$(hide) mkdir -p $(dir $@)

	$(hide) $(MERGETAGS) -o $@ $(PRIVATE_SRC_FILES)
@@ -572,9 +568,9 @@ event_log_tags_src := \ 
      $(ALL_MODULES.$(m).EVENT_LOG_TAGS)) \

      $(filter-out vendor/% device/% out/%,$(all_event_log_tags_src)))



$(event_log_tags_file): PRIVATE_SRC_FILES := $(event_log_tags_src) $(pdk_fusion_log_tags_file)

$(event_log_tags_file): PRIVATE_SRC_FILES := $(event_log_tags_src)

$(event_log_tags_file): PRIVATE_MERGED_FILE := $(all_event_log_tags_file)

$(event_log_tags_file): $(event_log_tags_src) $(all_event_log_tags_file) $(pdk_fusion_log_tags_file) $(MERGETAGS) build/make/tools/event_log_tags.py

$(event_log_tags_file): $(event_log_tags_src) $(all_event_log_tags_file) $(MERGETAGS) build/make/tools/event_log_tags.py

	$(hide) mkdir -p $(dir $@)

	$(hide) $(MERGETAGS) -o $@ -m $(PRIVATE_MERGED_FILE) $(PRIVATE_SRC_FILES)
@@ -955,7 +951,6 @@ tools_notice_file_txt := $(HOST_OUT_INTERMEDIATES)/NOTICE.txt 
tools_notice_file_html := $(HOST_OUT_INTERMEDIATES)/NOTICE.html

kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt

winpthreads_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/winpthreads.txt

pdk_fusion_notice_files := $(filter $(TARGET_OUT_NOTICE_FILES)/%, $(ALL_PDK_FUSION_FILES))



# Some targets get included under $(PRODUCT_OUT) for debug symbols or other

# reasons--not to be flashed onto any device. Targets under these directories
@@ -972,7 +967,7 @@ $(eval $(call combine-notice-files, html, \ 
	        $(target_notice_file_html), \

	        "Notices for files contained in the filesystem images in this directory:", \

	        $(TARGET_OUT_NOTICE_FILES), \

	        $(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file) $(pdk_fusion_notice_files), \

	        $(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file), \

	        $(exclude_target_dirs)))

$(target_notice_file_html_gz): $(target_notice_file_html) | $(MINIGZIP)

	$(hide) $(MINIGZIP) -9 < $< > $@
@@ -1016,7 +1011,7 @@ installed_odm_dlkm_notice_xml_gz := $(TARGET_OUT_ODM_DLKM)/etc/NOTICE.xml.gz 
# Notice files are copied to TARGET_OUT_NOTICE_FILES as a side-effect of their module

# being built. A notice xml file must depend on all modules that could potentially

# install a license file relevant to it.

license_modules := $(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file) $(pdk_fusion_notice_files)

license_modules := $(ALL_DEFAULT_INSTALLED_MODULES) $(kernel_notice_file)

# Only files copied to a system image need system image notices.

license_modules := $(filter $(PRODUCT_OUT)/%,$(license_modules))

# Phonys/fakes don't have notice files (though their deps might)
@@ -2277,17 +2272,10 @@ endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true 


# -----------------------------------------------------------------

# system image

#

# Remove overridden packages from $(ALL_PDK_FUSION_FILES)

PDK_FUSION_SYSIMG_FILES := \

    $(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \

        $(ALL_PDK_FUSION_FILES))



INTERNAL_SYSTEMIMAGE_FILES := $(sort $(filter $(TARGET_OUT)/%, \

    $(ALL_GENERATED_SOURCES) \

    $(ALL_DEFAULT_INSTALLED_MODULES) \

    $(PDK_FUSION_SYSIMG_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP))

    $(ALL_DEFAULT_INSTALLED_MODULES)))



FULL_SYSTEMIMAGE_DEPS := $(INTERNAL_SYSTEMIMAGE_FILES) $(INTERNAL_USERIMAGES_DEPS)
@@ -2455,111 +2443,14 @@ endif # BUILDING_SYSTEM_IMAGE 
sync syncsys: $(INTERNAL_SYSTEMIMAGE_FILES)



# -----------------------------------------------------------------

## platform.zip: system, plus other files to be used in PDK fusion build,

## in a zip file

##

## PDK_PLATFORM_ZIP_PRODUCT_BINARIES is used to store specified files to platform.zip.

## The variable will be typically set from BoardConfig.mk.

## Files under out dir will be rejected to prevent possible conflicts with other rules.

ifneq (,$(BUILD_PLATFORM_ZIP))

pdk_odex_javalibs := $(strip $(foreach m,$(DEXPREOPT.MODULES.JAVA_LIBRARIES),\

  $(if $(filter $(DEXPREOPT.$(m).INSTALLED_STRIPPED),$(ALL_DEFAULT_INSTALLED_MODULES)),$(m))))

pdk_odex_apps := $(strip $(foreach m,$(DEXPREOPT.MODULES.APPS),\

  $(if $(filter $(DEXPREOPT.$(m).INSTALLED_STRIPPED),$(ALL_DEFAULT_INSTALLED_MODULES)),$(m))))

pdk_classes_dex := $(strip \

  $(foreach m,$(pdk_odex_javalibs),$(call intermediates-dir-for,JAVA_LIBRARIES,$(m),,COMMON)/javalib.jar) \

  $(foreach m,$(pdk_odex_apps),$(call intermediates-dir-for,APPS,$(m))/package.apk))



pdk_odex_config_mk := $(PRODUCT_OUT)/pdk_dexpreopt_config.mk

$(pdk_odex_config_mk): PRIVATE_JAVA_LIBRARIES := $(pdk_odex_javalibs)

$(pdk_odex_config_mk): PRIVATE_APPS := $(pdk_odex_apps)

$(pdk_odex_config_mk) :

	@echo "PDK odex config makefile: $@"

	$(hide) mkdir -p $(dir $@)

	$(hide) echo "# Auto-generated. Do not modify." > $@

	$(hide) echo "PDK.DEXPREOPT.JAVA_LIBRARIES:=$(PRIVATE_JAVA_LIBRARIES)" >> $@

	$(hide) echo "PDK.DEXPREOPT.APPS:=$(PRIVATE_APPS)" >> $@

	$(foreach m,$(PRIVATE_JAVA_LIBRARIES),\

	  $(hide) echo "PDK.DEXPREOPT.$(m).SRC:=$(patsubst $(OUT_DIR)/%,%,$(call intermediates-dir-for,JAVA_LIBRARIES,$(m),,COMMON)/javalib.jar)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT:=$(DEXPREOPT.$(m).DEX_PREOPT)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).MULTILIB:=$(DEXPREOPT.$(m).MULTILIB)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT_FLAGS:=$(DEXPREOPT.$(m).DEX_PREOPT_FLAGS)" >> $@$(newline)\

	  )

	$(foreach m,$(PRIVATE_APPS),\

	  $(hide) echo "PDK.DEXPREOPT.$(m).SRC:=$(patsubst $(OUT_DIR)/%,%,$(call intermediates-dir-for,APPS,$(m))/package.apk)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT:=$(DEXPREOPT.$(m).DEX_PREOPT)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).MULTILIB:=$(DEXPREOPT.$(m).MULTILIB)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).DEX_PREOPT_FLAGS:=$(DEXPREOPT.$(m).DEX_PREOPT_FLAGS)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).PRIVILEGED_MODULE:=$(DEXPREOPT.$(m).PRIVILEGED_MODULE)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).VENDOR_MODULE:=$(DEXPREOPT.$(m).VENDOR_MODULE)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).TARGET_ARCH:=$(DEXPREOPT.$(m).TARGET_ARCH)" >> $@$(newline)\

	  $(hide) echo "PDK.DEXPREOPT.$(m).STRIPPED_SRC:=$(patsubst $(PRODUCT_OUT)/%,%,$(DEXPREOPT.$(m).INSTALLED_STRIPPED))" >> $@$(newline)\

	  )



PDK_PLATFORM_ZIP_PRODUCT_BINARIES := $(filter-out $(OUT_DIR)/%,$(PDK_PLATFORM_ZIP_PRODUCT_BINARIES))

INSTALLED_PLATFORM_ZIP := $(PRODUCT_OUT)/platform.zip



$(INSTALLED_PLATFORM_ZIP): PRIVATE_DEX_FILES := $(pdk_classes_dex)

$(INSTALLED_PLATFORM_ZIP): PRIVATE_ODEX_CONFIG := $(pdk_odex_config_mk)

$(INSTALLED_PLATFORM_ZIP) : $(SOONG_ZIP)

# dependencies for the other partitions are defined below after their file lists

# are known

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEMIMAGE_FILES) $(pdk_classes_dex) $(pdk_odex_config_mk) $(API_FINGERPRINT)

	$(call pretty,"Platform zip package: $(INSTALLED_PLATFORM_ZIP)")

	rm -f $@ $@.lst

	echo "-C $(PRODUCT_OUT)" >> $@.lst

	echo "-D $(TARGET_OUT)" >> $@.lst

	echo "-D $(TARGET_OUT_NOTICE_FILES)" >> $@.lst

	echo "$(addprefix -f $(TARGET_OUT_UNSTRIPPED)/,$(PDK_SYMBOL_FILES_LIST))" >> $@.lst

ifdef BUILDING_VENDOR_IMAGE

	echo "-D $(TARGET_OUT_VENDOR)" >> $@.lst

endif

ifdef BUILDING_PRODUCT_IMAGE

	echo "-D $(TARGET_OUT_PRODUCT)" >> $@.lst

endif

ifdef BUILDING_SYSTEM_EXT_IMAGE

	echo "-D $(TARGET_OUT_SYSTEM_EXT)" >> $@.lst

endif

ifdef BUILDING_ODM_IMAGE

	echo "-D $(TARGET_OUT_ODM)" >> $@.lst

endif

ifdef BUILDING_VENDOR_DLKM_IMAGE

	echo "-D $(TARGET_OUT_VENDOR_DLKM)" >> $@.lst

endif

ifdef BUILDING_ODM_DLKM_IMAGE

	echo "-D $(TARGET_OUT_ODM_DLKM)" >> $@.lst

endif

ifneq ($(PDK_PLATFORM_JAVA_ZIP_CONTENTS),)

	echo "-C $(OUT_DIR)" >> $@.lst

	for f in $(filter-out $(PRIVATE_DEX_FILES),$(addprefix -f $(OUT_DIR)/,$(PDK_PLATFORM_JAVA_ZIP_CONTENTS))); do \

	  if [ -e $$f ]; then \

	    echo "-f $$f"; \

	  fi \

	done >> $@.lst

endif

ifneq ($(PDK_PLATFORM_ZIP_PRODUCT_BINARIES),)

        echo "-C . $(addprefix -f ,$(PDK_PLATFORM_ZIP_PRODUCT_BINARIES))" >> $@.lst

endif

	@# Add dex-preopt files and config.

	$(if $(PRIVATE_DEX_FILES),\

	  echo "-C $(OUT_DIR) $(addprefix -f ,$(PRIVATE_DEX_FILES))") >> $@.lst

	echo "-C $(dir $(API_FINGERPRINT)) -f $(API_FINGERPRINT)" >> $@.lst

	touch $(PRODUCT_OUT)/pdk.mk

	echo "-C $(PRODUCT_OUT) -f $(PRIVATE_ODEX_CONFIG) -f $(PRODUCT_OUT)/pdk.mk" >> $@.lst

	$(SOONG_ZIP) --ignore_missing_files -o $@ @$@.lst



# Old PDK fusion targets

.PHONY: platform

platform: $(INSTALLED_PLATFORM_ZIP)

platform:

	echo "Warning: 'platform' is obsolete"



.PHONY: platform-java

platform-java: platform



# Dist the platform.zip

ifneq (,$(filter platform platform-java, $(MAKECMDGOALS)))

$(call dist-for-goals, platform platform-java, $(INSTALLED_PLATFORM_ZIP))

endif



endif # BUILD_PLATFORM_ZIP

platform-java:

	echo "Warning: 'platform-java' is obsolete"



# -----------------------------------------------------------------

# data partition image
@@ -2693,9 +2584,7 @@ endif 


INTERNAL_SYSTEMOTHERIMAGE_FILES := \

    $(filter $(TARGET_OUT_SYSTEM_OTHER)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES)\

      $(ALL_PDK_FUSION_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP)

      $(ALL_DEFAULT_INSTALLED_MODULES))



# system_other dex files are installed as a side-effect of installing system image files

INTERNAL_SYSTEMOTHERIMAGE_FILES += $(INTERNAL_SYSTEMIMAGE_FILES)
@@ -2758,12 +2647,7 @@ endif # BUILDING_SYSTEM_OTHER_IMAGE 
ifdef BUILDING_VENDOR_IMAGE

INTERNAL_VENDORIMAGE_FILES := \

    $(filter $(TARGET_OUT_VENDOR)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES)\

      $(ALL_PDK_FUSION_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP)



# platform.zip depends on $(INTERNAL_VENDORIMAGE_FILES).

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_VENDORIMAGE_FILES)

      $(ALL_DEFAULT_INSTALLED_MODULES))



INSTALLED_FILES_FILE_VENDOR := $(PRODUCT_OUT)/installed-files-vendor.txt

INSTALLED_FILES_JSON_VENDOR := $(INSTALLED_FILES_FILE_VENDOR:.txt=.json)
@@ -2891,12 +2775,7 @@ endif 
ifdef BUILDING_PRODUCT_IMAGE

INTERNAL_PRODUCTIMAGE_FILES := \

    $(filter $(TARGET_OUT_PRODUCT)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES)\

      $(ALL_PDK_FUSION_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP)



# platform.zip depends on $(INTERNAL_PRODUCTIMAGE_FILES).

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_PRODUCTIMAGE_FILES)

      $(ALL_DEFAULT_INSTALLED_MODULES))



INSTALLED_FILES_FILE_PRODUCT := $(PRODUCT_OUT)/installed-files-product.txt

INSTALLED_FILES_JSON_PRODUCT := $(INSTALLED_FILES_FILE_PRODUCT:.txt=.json)
@@ -2947,12 +2826,7 @@ endif 
ifdef BUILDING_SYSTEM_EXT_IMAGE

INTERNAL_SYSTEM_EXTIMAGE_FILES := \

    $(filter $(TARGET_OUT_SYSTEM_EXT)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES)\

      $(ALL_PDK_FUSION_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP)



# platform.zip depends on $(INTERNAL_SYSTEM_EXTIMAGE_FILES).

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_SYSTEM_EXTIMAGE_FILES)

      $(ALL_DEFAULT_INSTALLED_MODULES))



INSTALLED_FILES_FILE_SYSTEM_EXT := $(PRODUCT_OUT)/installed-files-system_ext.txt

INSTALLED_FILES_JSON_SYSTEM_EXT := $(INSTALLED_FILES_FILE_SYSTEM_EXT:.txt=.json)
@@ -3005,11 +2879,7 @@ endif 
ifdef BUILDING_ODM_IMAGE

INTERNAL_ODMIMAGE_FILES := \

    $(filter $(TARGET_OUT_ODM)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES)\

      $(ALL_PDK_FUSION_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP)

# platform.zip depends on $(INTERNAL_ODMIMAGE_FILES).

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_ODMIMAGE_FILES)

      $(ALL_DEFAULT_INSTALLED_MODULES))



INSTALLED_FILES_FILE_ODM := $(PRODUCT_OUT)/installed-files-odm.txt

INSTALLED_FILES_JSON_ODM := $(INSTALLED_FILES_FILE_ODM:.txt=.json)
@@ -3060,11 +2930,7 @@ endif 
ifdef BUILDING_VENDOR_DLKM_IMAGE

INTERNAL_VENDOR_DLKMIMAGE_FILES := \

    $(filter $(TARGET_OUT_VENDOR_DLKM)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES)\

      $(ALL_PDK_FUSION_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP)

# platform.zip depends on $(INTERNAL_VENDOR_DLKMIMAGE_FILES).

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_VENDOR_DLKMIMAGE_FILES)

      $(ALL_DEFAULT_INSTALLED_MODULES))



INSTALLED_FILES_FILE_VENDOR_DLKM := $(PRODUCT_OUT)/installed-files-vendor_dlkm.txt

INSTALLED_FILES_JSON_VENDOR_DLKM := $(INSTALLED_FILES_FILE_VENDOR_DLKM:.txt=.json)
@@ -3115,11 +2981,7 @@ endif 
ifdef BUILDING_ODM_DLKM_IMAGE

INTERNAL_ODM_DLKMIMAGE_FILES := \

    $(filter $(TARGET_OUT_ODM_DLKM)/%,\

      $(ALL_DEFAULT_INSTALLED_MODULES)\

      $(ALL_PDK_FUSION_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP)

# platform.zip depends on $(INTERNAL_ODM_DLKMIMAGE_FILES).

$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_ODM_DLKMIMAGE_FILES)

      $(ALL_DEFAULT_INSTALLED_MODULES))



INSTALLED_FILES_FILE_ODM_DLKM := $(PRODUCT_OUT)/installed-files-odm_dlkm.txt

INSTALLED_FILES_JSON_ODM_DLKM := $(INSTALLED_FILES_FILE_ODM_DLKM:.txt=.json)
@@ -3939,9 +3801,6 @@ else 
  ifeq ($(TARGET_PRODUCT),sdk)

    build_ota_package := false

  endif

  ifeq ($(TARGET_BUILD_PDK),true)

    build_ota_package := false

  endif

  ifneq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)

    ifneq ($(filter generic%,$(TARGET_DEVICE)),)

      build_ota_package := false
@@ -5313,13 +5172,6 @@ $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES) 
	$(hide) zip -qjX $@ $(INTERNAL_EMULATOR_PACKAGE_FILES)



endif

# -----------------------------------------------------------------

# Old PDK stuffs, retired

# The pdk package (Platform Development Kit)



#ifneq (,$(filter pdk,$(MAKECMDGOALS)))

#  include development/pdk/Pdk.mk

#endif





# -----------------------------------------------------------------

core/app_prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ built_module := $(LOCAL_BUILT_MODULE) 
# We skip it for unbundled app builds where we cannot build veridex.

module_run_appcompat :=

ifeq (true,$(non_system_module))

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))  # ! unbundled app build

ifeq (,$(TARGET_BUILD_APPS))  # ! unbundled app build

ifneq ($(UNSAFE_DISABLE_HIDDENAPI_FLAGS),true)

  module_run_appcompat := true

endif

core/config.mk

+5 −88
Original line number Diff line number Diff line
@@ -428,95 +428,12 @@ endif 
endif

endif



# Set up PDK so we can use TARGET_BUILD_PDK to select prebuilt tools below

.PHONY: pdk fusion

pdk fusion: $(DEFAULT_GOAL)



# What to build:

# pdk fusion if:

# 1) PDK_FUSION_PLATFORM_ZIP / PDK_FUSION_PLATFORM_DIR is passed in from the environment

# or

# 2) the platform.zip / pdk.mk exists in the default location

# or

# 3) fusion is a command line build goal,

#    PDK_FUSION_PLATFORM_ZIP is needed anyway, then do we need the 'fusion' goal?

# otherwise pdk only if:

# 1) pdk is a command line build goal

# or

# 2) TARGET_BUILD_PDK is passed in from the environment



# if PDK_FUSION_PLATFORM_ZIP or PDK_FUSION_PLATFORM_DIR is specified, do not override.

ifeq (,$(strip $(PDK_FUSION_PLATFORM_ZIP)$(PDK_FUSION_PLATFORM_DIR)))

  # Most PDK project paths should be using vendor/pdk/TARGET_DEVICE

  # but some legacy ones (e.g. mini_armv7a_neon generic PDK) were setup

  # with vendor/pdk/TARGET_PRODUCT.

  # Others are set up with vendor/pdk/TARGET_DEVICE/TARGET_DEVICE-userdebug

  _pdk_fusion_search_paths := \

    vendor/pdk/$(TARGET_DEVICE)/$(TARGET_DEVICE)-$(TARGET_BUILD_VARIANT)/platform \

    vendor/pdk/$(TARGET_DEVICE)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform \

    vendor/pdk/$(TARGET_DEVICE)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform \

    vendor/pdk/$(TARGET_PRODUCT)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform \

    vendor/pdk/$(TARGET_PRODUCT)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform



  _pdk_fusion_default_platform_zip := $(strip $(foreach p,$(_pdk_fusion_search_paths),$(wildcard $(p)/platform.zip)))

  ifneq (,$(_pdk_fusion_default_platform_zip))

    PDK_FUSION_PLATFORM_ZIP := $(word 1, $(_pdk_fusion_default_platform_zip))

    _pdk_fusion_default_platform_zip :=

  else

    _pdk_fusion_default_platform_mk := $(strip $(foreach p,$(_pdk_fusion_search_paths),$(wildcard $(p)/pdk.mk)))

    ifneq (,$(_pdk_fusion_default_platform_mk))

      PDK_FUSION_PLATFORM_DIR := $(dir $(word 1,$(_pdk_fusion_default_platform_mk)))

      _pdk_fusion_default_platform_mk :=

    endif

  endif # _pdk_fusion_default_platform_zip

  _pdk_fusion_search_paths :=

endif # !PDK_FUSION_PLATFORM_ZIP && !PDK_FUSION_PLATFORM_DIR



ifneq (,$(PDK_FUSION_PLATFORM_ZIP))

  ifneq (,$(PDK_FUSION_PLATFORM_DIR))

    $(error Only one of PDK_FUSION_PLATFORM_ZIP or PDK_FUSION_PLATFORM_DIR may be specified)

  endif

endif



ifneq (,$(filter pdk fusion, $(MAKECMDGOALS)))

TARGET_BUILD_PDK := true

ifneq (,$(filter fusion, $(MAKECMDGOALS)))

ifeq (,$(strip $(PDK_FUSION_PLATFORM_ZIP)$(PDK_FUSION_PLATFORM_DIR)))

  $(error Specify PDK_FUSION_PLATFORM_ZIP or PDK_FUSION_PLATFORM_DIR to do a PDK fusion.)

endif

endif  # fusion

endif  # pdk or fusion



ifdef PDK_FUSION_PLATFORM_ZIP

TARGET_BUILD_PDK := true

ifeq (,$(wildcard $(PDK_FUSION_PLATFORM_ZIP)))

  ifneq (,$(wildcard $(patsubst %.zip,%,$(PDK_FUSION_PLATFORM_ZIP))/pdk.mk))

    PDK_FUSION_PLATFORM_DIR := $(patsubst %.zip,%,$(PDK_FUSION_PLATFORM_ZIP))

    PDK_FUSION_PLATFORM_ZIP :=

  else

    $(error Cannot find file $(PDK_FUSION_PLATFORM_ZIP).)

  endif

endif

endif



ifdef PDK_FUSION_PLATFORM_DIR

TARGET_BUILD_PDK := true

ifeq (,$(wildcard $(PDK_FUSION_PLATFORM_DIR)/pdk.mk))

  $(error Cannot find file $(PDK_FUSION_PLATFORM_DIR)/pdk.mk.)

endif

endif



BUILD_PLATFORM_ZIP := $(filter platform platform-java,$(MAKECMDGOALS))



# ---------------------------------------------------------------

# Whether we can expect a full build graph

ALLOW_MISSING_DEPENDENCIES := $(filter true,$(ALLOW_MISSING_DEPENDENCIES))

ifneq ($(TARGET_BUILD_APPS),)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifeq ($(TARGET_BUILD_PDK),true)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifeq ($(TARGET_BUILD_UNBUNDLED_IMAGE),true)

ALLOW_MISSING_DEPENDENCIES := true

endif
@@ -561,23 +478,23 @@ USE_D8 := true 
#

# Tools that are prebuilts for TARGET_BUILD_USE_PREBUILT_SDKS

#

ifeq (,$(TARGET_BUILD_USE_PREBUILT_SDKS)$(filter true,$(TARGET_BUILD_PDK)))

ifeq (,$(TARGET_BUILD_USE_PREBUILT_SDKS))

  AAPT := $(HOST_OUT_EXECUTABLES)/aapt

  MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses



else # TARGET_BUILD_USE_PREBUILT_SDKS || TARGET_BUILD_PDK

else # TARGET_BUILD_USE_PREBUILT_SDKS

  AAPT := $(prebuilt_sdk_tools_bin)/aapt

  MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses

endif # TARGET_BUILD_USE_PREBUILT_SDKS || TARGET_BUILD_PDK

endif # TARGET_BUILD_USE_PREBUILT_SDKS



ifeq (,$(TARGET_BUILD_USE_PREBUILT_SDKS))

  # Use RenderScript prebuilts for unbundled builds but not PDK builds

  # Use RenderScript prebuilts for unbundled builds

  LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc

  BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat

else

  LLVM_RS_CC := $(prebuilt_sdk_tools_bin)/llvm-rs-cc

  BCC_COMPAT := $(prebuilt_sdk_tools_bin)/bcc_compat

endif # TARGET_BUILD_PDK

endif



prebuilt_sdk_tools :=

prebuilt_sdk_tools_bin :=

core/distdir.mk

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ _all_dist_src_dst_pairs := 
# certain files with certain goals.  When those goals are built

# and "dist" is specified, the marked files will be copied to DIST_DIR.

#

# $(1): a list of goals  (e.g. droid, sdk, pdk, ndk). These must be PHONY

# $(1): a list of goals  (e.g. droid, sdk, ndk). These must be PHONY

# $(2): the dist files to add to those goals.  If the file contains ':',

#       the text following the colon is the name that the file is copied

#       to under the dist directory.  Subdirs are ok, and will be created

core/java.mk

+0 −11
Original line number Diff line number Diff line
@@ -4,17 +4,6 @@ 
# LOCAL_MODULE_CLASS

# all_res_assets



ifeq ($(TARGET_BUILD_PDK),true)

ifeq ($(TARGET_BUILD_PDK_JAVA_PLATFORM),)

# LOCAL_SDK not defined or set to current

ifeq ($(filter-out current,$(LOCAL_SDK_VERSION)),)

ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

LOCAL_SDK_VERSION := $(PDK_BUILD_SDK_VERSION)

endif #!LOCAL_NO_STANDARD_LIBRARIES

endif

endif # !PDK_JAVA

endif #PDK



LOCAL_NO_STANDARD_LIBRARIES:=$(strip $(LOCAL_NO_STANDARD_LIBRARIES))

LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION))