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

Commit 86779762 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename the Default* constants in java/config." am: dada4c09 

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

Change-Id: I7ae19adc4ade3913c8acb3f2424ff7a25ebe6329
parents 7f28fe4e dada4c09

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ endif 
else

  # For platform build, we can't just raise to the "current" SDK,

  # that would break apps that use APIs removed from the current SDK.

  my_proguard_sdk_raise := $(call java-lib-header-files,$(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES))

  my_proguard_sdk_raise := $(call java-lib-header-files,$(LEGACY_CORE_PLATFORM_BOOTCLASSPATH_LIBRARIES) $(FRAMEWORK_LIBRARIES))

endif

ifdef BOARD_SYSTEMSDK_VERSIONS

ifneq (,$(filter true,$(LOCAL_VENDOR_MODULE) $(LOCAL_ODM_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

core/java_common.mk

+6 −6
Original line number Diff line number Diff line
@@ -265,11 +265,11 @@ ifndef LOCAL_IS_HOST_MODULE 
      # Most users of LOCAL_NO_STANDARD_LIBRARIES really mean no framework libs,

      # and manually add back the core libs.  The ones that don't are in soong

      # now, so just always assume that they want the default system modules

      my_system_modules := $(DEFAULT_SYSTEM_MODULES)

      my_system_modules := $(LEGACY_CORE_PLATFORM_SYSTEM_MODULES)

    else  # LOCAL_NO_STANDARD_LIBRARIES

      full_java_bootclasspath_libs := $(call java-lib-header-files,$(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES))

      LOCAL_JAVA_LIBRARIES := $(filter-out $(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES) $(TARGET_DEFAULT_JAVA_LIBRARIES),$(LOCAL_JAVA_LIBRARIES))

      my_system_modules := $(DEFAULT_SYSTEM_MODULES)

      full_java_bootclasspath_libs := $(call java-lib-header-files,$(LEGACY_CORE_PLATFORM_BOOTCLASSPATH_LIBRARIES) $(FRAMEWORK_LIBRARIES))

      LOCAL_JAVA_LIBRARIES := $(filter-out $(LEGACY_CORE_PLATFORM_BOOTCLASSPATH_LIBRARIES) $(FRAMEWORK_LIBRARIES),$(LOCAL_JAVA_LIBRARIES))

      my_system_modules := $(LEGACY_CORE_PLATFORM_SYSTEM_MODULES)

    endif  # LOCAL_NO_STANDARD_LIBRARIES



    ifneq (,$(TARGET_BUILD_APPS_USE_PREBUILT_SDK))
@@ -352,10 +352,10 @@ else # LOCAL_IS_HOST_MODULE 
    ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

      empty_bootclasspath := ""

    else

      full_java_bootclasspath_libs := $(call java-lib-header-files,$(addsuffix -hostdex,$(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES)),true)

      full_java_bootclasspath_libs := $(call java-lib-header-files,$(addsuffix -hostdex,$(LEGACY_CORE_PLATFORM_BOOTCLASSPATH_LIBRARIES)),true)

    endif



    my_system_modules := $(DEFAULT_SYSTEM_MODULES)

    my_system_modules := $(LEGACY_CORE_PLATFORM_SYSTEM_MODULES)

    full_shared_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),true)

    full_shared_java_header_libs := $(call java-lib-header-files,$(LOCAL_JAVA_LIBRARIES),true)

  else # !USE_CORE_LIB_BOOTCLASSPATH