From ebb351e1b38422345e060ba3a986f470e461c95c Mon Sep 17 00:00:00 2001
From: Keun young Park <keunyoung@google.com>
Date: Thu, 19 Apr 2012 15:36:18 -0700
Subject: [PATCH] enable Java build for PDK build - Highest LOCAL_SDK_VERSION
 forced for package build / java library build

Bug: 6352960
Change-Id: I4a26bf26a51b95fb97c8b2adc9d32a543832c708
---
 core/java.mk       | 8 ++++++++
 core/pdk_config.mk | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/core/java.mk b/core/java.mk
index b302c9f5f..4005ce3a1 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 729a44aac..c0f80fd2e 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -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