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

Commit 8e7a4c41 authored by Sundong Ahn's avatar Sundong Ahn
Browse files

Fix build error 

Fix the build error when TARGET_BUILD_APPS is set

Bug: None
Test: make -j40 && make -j110 showcommands dist
TARGET_BUILD_APPS='TimeZoneData TimeZoneData_test1 TimeZoneData_test2'
TARGET_BUILD_VARIANT=userdebug

Change-Id: I981b0a245d7e8f2dabbd4e51db52d17aeacc6106
parent 0c49bcf1

core/apidiff.mk

+7 −2
Original line number Diff line number Diff line
@@ -58,12 +58,17 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, android_test_stubs_current)

  else

    ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))

      ifeq (,$(TARGET_BUILD_APPS))

        LOCAL_JAVA_LIBRARIES := system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)) $(LOCAL_JAVA_LIBRARIES)

        $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)))

      else

        LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)

        $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION))

      endif

    else

      LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)

      $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION))

    endif

  endif

else

  LOCAL_JAVA_LIBRARIES := core-oj core-libart ext framework $(LOCAL_JAVA_LIBRARIES)

core/droiddoc.mk

+7 −2
Original line number Diff line number Diff line
@@ -73,12 +73,17 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, android_test_stubs_current)

  else

    ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))

      ifeq (,$(TARGET_BUILD_APPS))

        LOCAL_JAVA_LIBRARIES := system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)) $(LOCAL_JAVA_LIBRARIES)

        $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)))

      else

        LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)

        $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION))

      endif

    else

      LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)

      $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION))

    endif

  endif

else

  LOCAL_JAVA_LIBRARIES := core-oj core-libart ext framework $(LOCAL_JAVA_LIBRARIES)

core/java_common.mk

+5 −1
Original line number Diff line number Diff line
@@ -230,10 +230,14 @@ ifndef LOCAL_IS_HOST_MODULE 
      full_java_bootclasspath_libs := $(call java-lib-header-files,android_test_stubs_current)

    else

      ifneq (,$(call has-system-sdk-version,$(LOCAL_SDK_VERSION)))

        ifeq (,$(TARGET_BUILD_APPS))

          full_java_bootclasspath_libs := $(call java-lib-header-files,system_sdk_v$(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION)))

        else

          full_java_bootclasspath_libs := $(call java-lib-header-files,sdk_v$(LOCAL_SDK_VERSION))

        endif

      else

        full_java_bootclasspath_libs := $(call java-lib-header-files,sdk_v$(LOCAL_SDK_VERSION))

      endif

    endif # current, system_current, system_${VER} or test_current

  endif # LOCAL_SDK_VERSION