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
diff --git a/core/java.mk b/core/java.mk
index b302c9f..4005ce3 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -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)))
diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index 98f34a5..8e3f1bb 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -64,3 +64,11 @@
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
diff --git a/tools/Android.mk b/tools/Android.mk
index 92603f5..fe29e2b 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -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))