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

Commit a4a1f208 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I0a1aa003,I000c3c22 

* changes:
  Use dx or d8 from prebuilts/build-tools
  Desugar lambdas in javac unbundled builds
parents fcdbbd0d 78542b9e

core/config.mk

+21 −13
Original line number Diff line number Diff line
@@ -499,6 +499,16 @@ endif 
prebuilt_sdk_tools := prebuilts/sdk/tools

prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin



# Always use prebuilts for ckati and makeparallel

prebuilt_build_tools := prebuilts/build-tools

prebuilt_build_tools_wrappers := prebuilts/build-tools/common/bin

prebuilt_build_tools_jars := prebuilts/build-tools/common/framework

ifeq ($(filter address,$(SANITIZE_HOST)),)

prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin

else

prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/asan/bin

endif



USE_PREBUILT_SDK_TOOLS_IN_PLACE := true



#
@@ -508,6 +518,7 @@ ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) 
  AIDL := $(HOST_OUT_EXECUTABLES)/aidl

  AAPT := $(HOST_OUT_EXECUTABLES)/aapt

  AAPT2 := $(HOST_OUT_EXECUTABLES)/aapt2

  DESUGAR := $(HOST_OUT_JAVA_LIBRARIES)/desugar.jar

  MAINDEXCLASSES := $(HOST_OUT_EXECUTABLES)/mainDexClasses

  SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)

  SIGNAPK_JNI_LIBRARY_PATH := $(HOST_OUT_SHARED_LIBRARIES)
@@ -518,20 +529,26 @@ ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) 
  else

    DX := $(HOST_OUT_EXECUTABLES)/dx

  endif

  DX_COMMAND := $(DX) -JXms16M -JXmx2048M



else # TARGET_BUILD_APPS || TARGET_BUILD_PDK

  AIDL := $(prebuilt_sdk_tools_bin)/aidl

  AAPT := $(prebuilt_sdk_tools_bin)/aapt

  AAPT2 := $(prebuilt_sdk_tools_bin)/aapt2

  DX := $(prebuilt_sdk_tools)/dx

  DX_COMMAND := $(DX) -JXms16M -JXmx2048M

  DESUGAR := $(prebuilt_build_tools_jars)/desugar.jar

  MAINDEXCLASSES := $(prebuilt_sdk_tools)/mainDexClasses

  ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign

  SIGNAPK_JAR := $(prebuilt_sdk_tools)/lib/signapk$(COMMON_JAVA_PACKAGE_SUFFIX)

  SIGNAPK_JNI_LIBRARY_PATH := $(prebuilt_sdk_tools)/$(HOST_OS)/lib64

  ZIPALIGN := $(prebuilt_sdk_tools_bin)/zipalign



  ifeq ($(USE_D8),true)

    DX := $(prebuilt_build_tools_wrappers)/d8

  else

    DX := $(prebuilt_build_tools_wrappers)/dx

  endif

endif # TARGET_BUILD_APPS || TARGET_BUILD_PDK



DX_COMMAND := $(DX) -JXms16M -JXmx2048M



ifeq (,$(TARGET_BUILD_APPS))

  # Use RenderScript prebuilts for unbundled builds but not PDK builds

  LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc
@@ -544,14 +561,6 @@ endif # TARGET_BUILD_PDK 
prebuilt_sdk_tools :=

prebuilt_sdk_tools_bin :=



# Always use prebuilts for ckati and makeparallel

prebuilt_build_tools := prebuilts/build-tools

ifeq ($(filter address,$(SANITIZE_HOST)),)

prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin

else

prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/asan/bin

endif



ACP := $(prebuilt_build_tools_bin)/acp

CKATI := $(prebuilt_build_tools_bin)/ckati

DEPMOD := $(HOST_OUT_EXECUTABLES)/depmod
@@ -632,7 +641,6 @@ E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX) 
MKTARBALL := build/tools/mktarball.sh

TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)

JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar

DESUGAR := $(HOST_OUT_JAVA_LIBRARIES)/desugar.jar

DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar

FAT16COPY := build/tools/fat16copy.py

CHECK_LINK_TYPE := build/tools/check_link_type.py

core/java_common.mk

+7 −8
Original line number Diff line number Diff line
@@ -237,17 +237,16 @@ ifndef LOCAL_IS_HOST_MODULE 
  # In order to compile lambda code javac requires various invokedynamic-

  # related classes to be present. This change adds stubs needed for

  # javac to compile lambdas.

  my_additional_javac_libs :=

  ifndef TARGET_BUILD_APPS

    # TODO: support to build lamdbas using javac in unbundled build.

    # We may need to check in a prebuilt core-lambda-stubs to prebuilts/sdk.

  ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

      my_additional_javac_libs := core-lambda-stubs

    ifdef TARGET_BUILD_APPS

      full_java_bootclasspath_libs += $(call java-lib-header-files,sdk-core-lambda-stubs)

    else

      full_java_bootclasspath_libs += $(call java-lib-header-files,core-lambda-stubs)

    endif

  endif



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

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

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

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



else # LOCAL_IS_HOST_MODULE