Merge "Warn more clearly when there are duplicate copied headers" into nyc-dev
diff --git a/core/java_common.mk b/core/java_common.mk
index b88bfe4..59f473c 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -4,7 +4,7 @@
## Java version
###########################################################
ifeq (,$(LOCAL_JAVA_LANGUAGE_VERSION))
- LOCAL_JAVA_LANGUAGE_VERSION := 1.7
+ LOCAL_JAVA_LANGUAGE_VERSION := 1.8
endif
LOCAL_JAVACFLAGS += -source $(LOCAL_JAVA_LANGUAGE_VERSION) -target $(LOCAL_JAVA_LANGUAGE_VERSION)
diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index 7cb1fd3..2945f8c 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -73,6 +73,7 @@
device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
+ frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml \
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf