commit 6c2a17e407619b5213fe4527298e43de122e629d
author Neil Fuller <nfuller@google.com> Fri Jan 29 11:00:31 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 29 11:00:31 2016 +0000
tree 9fc2272d2baf3636149fdff86edef23b3d33c9a4
parent e13b3b1dfc9ae91e24e0d80af1e916072a149b3c
parent cdfbe4a8522b9a13ffe6ac1f826a1d6760f87d60

Merge "Allow java targets to support 1.8 source / target"

core/pdk_config.mk

diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index 95eb0cc..b63031f 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -79,7 +79,9 @@
 	$(PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR)
 
 PDK_PLATFORM_JAVA_ZIP_CONTENTS += $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR),\
-    $(lib_dir)/classes.jack $(lib_dir)/classes.jar $(lib_dir)/javalib.jar)
+    $(lib_dir)/classes.jack $(lib_dir)/classes.jar $(lib_dir)/classes.jar.toc \
+    $(lib_dir)/javalib.jar  $(lib_dir)/classes*.dex \
+    $(lib_dir)/classes.dex.toc )
 
 # check and override java support level
 ifneq ($(TARGET_BUILD_PDK)$(PDK_FUSION_PLATFORM_ZIP),)
@@ -151,7 +153,7 @@
 
 define JAVA_dependency_template
 $(PDK_FUSION_OUT_DIR)/$(strip $(1)): $(_pdk_fusion_intermediates)/$(strip $(1)) \
-  $(PDK_FUSION_OUT_DIR)/$(strip $(2)) $(_pdk_fusion_stamp)
+  $(foreach d,$(2),$(PDK_FUSION_OUT_DIR)/$(d)) $(_pdk_fusion_stamp)
 	@mkdir -p $$(dir $$@)
 	$(hide) cp -fpPR $$< $$@
 endef
@@ -166,6 +168,14 @@
 $(eval $(call JAVA_dependency_template,$(lib_dir)/javalib.jar,\
 $(lib_dir)/classes.jar)))
 
+# pull .jack and .dex files
+$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\
+  $(eval $(call JAVA_dependency_template,$(lib_dir)/classes.jar.toc,\
+    $(lib_dir)/classes.jar $(lib_dir)/classes.jack)))
+$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\
+  $(eval $(call JAVA_dependency_template,$(lib_dir)/classes.dex.toc,\
+    $(filter $(lib_dir)/classes%.dex, $(_pdk_fusion_java_file_list)))))
+
 # implicit rules for all other target files
 $(TARGET_COMMON_OUT_ROOT)/% : $(_pdk_fusion_intermediates)/target/common/% $(_pdk_fusion_stamp)
 	@mkdir -p $(dir $@)

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 1d7f603..880c1a2 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -30,6 +30,7 @@
     blkid \
     bmgr \
     bugreport \
+    cameraserver \
     content \
     dhcpcd \
     dhcpcd-run-hooks \
@@ -100,6 +101,7 @@
     libvisualizer \
     libvorbisidec \
     libmediandk \
+    libvulkan \
     libwifi-service \
     media \
     media_cmd \