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

Commit 9283168e authored Apr 19, 2012 by Keun young Park

enable Java build for PDK build

- Highest LOCAL_SDK_VERSION forced for package build / java library build
- uses prebuilt tools for PDK

Bug: 6352960
Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d

parent 78261016

core/java.mk

+8 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,14 @@
		# LOCAL_MODULE_CLASS
		# all_res_assets

		ifeq ($(TARGET_BUILD_PDK),true)
		# LOCAL_SDK not defined or set to current
		ifeq ($(filter-out current,$(LOCAL_SDK_VERSION)),)
		LOCAL_SDK_VERSION := $(PDK_BUILD_SDK_VERSION)
		endif
		endif #PDK


		# Make sure there's something to build.
		# It's possible to build a package that doesn't contain any classes.
		ifeq (,$(strip $(LOCAL_SRC_FILES)$(all_res_assets)$(LOCAL_STATIC_JAVA_LIBRARIES)))

core/pdk_config.mk

+8 −0

Original line number	Diff line number	Diff line
		@@ -64,3 +64,11 @@ $(PRODUCT_OUT)/% : $(_pdk_fusion_intermediates)/%
		ALL_PDK_FUSION_FILES := $(addprefix $(PRODUCT_OUT)/, $(_pdk_fusion_file_list))

		endif

		ifeq ($(TARGET_BUILD_PDK),true)

		# SDK used for Java build under PDK
		PDK_BUILD_SDK_VERSION := $(lastword $(TARGET_AVAILABLE_SDK_VERSIONS))
		$(info PDK Build uses SDK $(PDK_BUILD_SDK_VERSION))

		endif # BUILD_PDK

tools/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		LOCAL_PATH := $(call my-dir)

		# If we're building only unbundled apps, this is the only tool we need.
		ifneq ($(TARGET_BUILD_APPS),)
		ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
		include $(LOCAL_PATH)/signapk/Android.mk
		else
		include $(call first-makefiles-under,$(LOCAL_PATH))