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

Commit 64183988 authored by Jeongik Cha's avatar Jeongik Cha Committed by Automerger Merge Worker
Browse files

Merge changes from topic "b/160390776" am: 66853bb3 am: 37cd475e am: dd87cdea 

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

Change-Id: I54e002de5d1aca888086b27719dfbdab717a33ac
parents 65b2c1e3 dd87cdea

core/android_manifest.mk

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ my_target_sdk_version := $(call module-target-sdk-version) 
my_min_sdk_version := $(call module-min-sdk-version)



ifdef TARGET_BUILD_APPS

  ifndef TARGET_BUILD_APPS_USE_PREBUILT_SDK

  ifndef TARGET_BUILD_USE_PREBUILT_SDKS

    ifeq ($(my_target_sdk_version),$(PLATFORM_VERSION_CODENAME))

      ifdef UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT

        my_target_sdk_version := $(my_target_sdk_version).$$(cat $(API_FINGERPRINT))

core/config.mk

+18 −9
Original line number Diff line number Diff line
@@ -517,18 +517,27 @@ endif 
ifeq ($(TARGET_BUILD_PDK),true)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifeq ($(TARGET_BUILD_UNBUNDLED_IMAGE),true)

ALLOW_MISSING_DEPENDENCIES := true

endif

ifneq ($(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),)

ALLOW_MISSING_DEPENDENCIES := true

endif

.KATI_READONLY := ALLOW_MISSING_DEPENDENCIES



TARGET_BUILD_APPS_USE_PREBUILT_SDK :=

ifdef TARGET_BUILD_APPS

TARGET_BUILD_USE_PREBUILT_SDKS :=

DISABLE_PREOPT :=

ifneq (,$(TARGET_BUILD_APPS)$(TARGET_BUILD_UNBUNDLED_IMAGE))

  DISABLE_PREOPT := true

  ifndef UNBUNDLED_BUILD_SDKS_FROM_SOURCE

    TARGET_BUILD_APPS_USE_PREBUILT_SDK := true

    TARGET_BUILD_USE_PREBUILT_SDKS := true

  endif

endif



.KATI_READONLY := \

  TARGET_BUILD_USE_PREBUILT_SDKS \

  DISABLE_PREOPT \



prebuilt_sdk_tools := prebuilts/sdk/tools

prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin
@@ -550,18 +559,18 @@ USE_D8 := true 
.KATI_READONLY := USE_D8



#

# Tools that are prebuilts for TARGET_BUILD_APPS

# Tools that are prebuilts for TARGET_BUILD_USE_PREBUILT_SDKS

#

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

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

  AAPT := $(HOST_OUT_EXECUTABLES)/aapt

  MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses



else # TARGET_BUILD_APPS || TARGET_BUILD_PDK

else # TARGET_BUILD_USE_PREBUILT_SDKS || TARGET_BUILD_PDK

  AAPT := $(prebuilt_sdk_tools_bin)/aapt

  MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses

endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK

endif # TARGET_BUILD_USE_PREBUILT_SDKS || TARGET_BUILD_PDK



ifeq (,$(TARGET_BUILD_APPS))

ifeq (,$(TARGET_BUILD_USE_PREBUILT_SDKS))

  # Use RenderScript prebuilts for unbundled builds but not PDK builds

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

  BCC_COMPAT := $(HOST_OUT_EXECUTABLES)/bcc_compat
@@ -1109,7 +1118,7 @@ HISTORICAL_SDK_VERSIONS_ROOT := $(TOPDIR)prebuilts/sdk 
HISTORICAL_NDK_VERSIONS_ROOT := $(TOPDIR)prebuilts/ndk



# The path where app can reference the support library resources.

ifdef TARGET_BUILD_APPS

ifdef TARGET_BUILD_USE_PREBUILT_SDKS

SUPPORT_LIBRARY_ROOT := $(HISTORICAL_SDK_VERSIONS_ROOT)/current/support

else

SUPPORT_LIBRARY_ROOT := frameworks/support

core/dex_preopt_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ ifneq (true,$(filter true,$(WITH_DEXPREOPT))) 
  ENABLE_PREOPT :=

else ifneq (true,$(filter true,$(PRODUCT_USES_DEFAULT_ART_CONFIG)))

  ENABLE_PREOPT :=

else ifneq (,$(TARGET_BUILD_APPS))

else ifeq (true,$(DISABLE_PREOPT))

  ENABLE_PREOPT :=

endif

core/dex_preopt_odex_install.mk

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ ifneq (,$(filter $(LOCAL_MODULE),$(DEXPREOPT_DISABLED_MODULES))) 
  LOCAL_DEX_PREOPT :=

endif



# Disable preopt for TARGET_BUILD_APPS

ifneq (,$(TARGET_BUILD_APPS))

# Disable preopt for DISABLE_PREOPT

ifeq (true,$(DISABLE_PREOPT))

  LOCAL_DEX_PREOPT :=

endif

core/envsetup.mk

+9 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ TARGET_BUILD_VARIANT := eng 
endif



TARGET_BUILD_APPS ?=

TARGET_BUILD_UNBUNDLED_IMAGE ?=



# Set to true for an unbundled build, i.e. a build without

# support for platform targets like the system image. This also
@@ -107,11 +108,19 @@ ifneq ($(TARGET_BUILD_APPS),) 
  TARGET_BUILD_UNBUNDLED := true

endif



# TARGET_BUILD_UNBUNDLED_IMAGE also implies unbundled build.

# (i.e. it targets to only unbundled image, such as the vendor image,

# ,or the product image). 

ifneq ($(TARGET_BUILD_UNBUNDLED_IMAGE),)

  TARGET_BUILD_UNBUNDLED := true

endif



.KATI_READONLY := \

  TARGET_PRODUCT \

  TARGET_BUILD_VARIANT \

  TARGET_BUILD_APPS \

  TARGET_BUILD_UNBUNDLED \

  TARGET_BUILD_UNBUNDLED_IMAGE \



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

# Set up configuration for host machine.  We don't do cross-