Merge "Require a vendor_ prefix for users/groups in /vendor/etc/{passwd,group}" am: e64694118a am: 76d1158cc1
am: 9f3df61349
Change-Id: I87fa852e55a84d28e6e6d198bae085b51df07ae3
diff --git a/core/build_id.mk b/core/build_id.mk
index bac2f48..2f9c3f3 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=PI
+BUILD_ID=MASTER
diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index d56c68a..089df6f 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -183,12 +183,6 @@
ifdef LOCAL_DEX_PREOPT
dexpreopt_boot_jar_module := $(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE))
-
-# Filter org.apache.http.legacy.boot.
-ifeq ($(dexpreopt_boot_jar_module),org.apache.http.legacy.boot)
-dexpreopt_boot_jar_module :=
-endif
-
ifdef dexpreopt_boot_jar_module
# For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).
# We use this installed_odex trick to get boot.art installed.
diff --git a/core/fuzz_test.mk b/core/fuzz_test.mk
index 2cc2e2c..f3bf714 100644
--- a/core/fuzz_test.mk
+++ b/core/fuzz_test.mk
@@ -65,12 +65,12 @@
$(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH_64 when building test $(LOCAL_MODULE))
endif
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(LOCAL_MODULE)
-LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(LOCAL_MODULE)
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(my_fuzzer)/$(LOCAL_MODULE)
+LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/fuzzers/$(my_fuzzer)/$(LOCAL_MODULE)
ifndef LOCAL_MULTILIB
ifndef LOCAL_32_BIT_ONLY
-LOCAL_MULTILIB := both
+LOCAL_MULTILIB := 64
endif
endif
diff --git a/core/jetifier.mk b/core/jetifier.mk
index 33a4624..6ec8158 100644
--- a/core/jetifier.mk
+++ b/core/jetifier.mk
@@ -24,7 +24,7 @@
$(my_jetifier_output_path) : $(my_jetifier_input_path) $(JETIFIER)
rm -rf $@
- $(JETIFIER) -outputfile $@ -i $<
+ $(JETIFIER) -l error -outputfile $@ -i $<
LOCAL_JETIFIER_OUTPUT_FILE := $(my_jetifier_output_path)
LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_JETIFIER_OUTPUT_FILE)
diff --git a/core/sdk_check.mk b/core/sdk_check.mk
index 49ea2a8..c09fc7c 100644
--- a/core/sdk_check.mk
+++ b/core/sdk_check.mk
@@ -8,6 +8,11 @@
whitelisted_modules := framework-res__auto_generated_rro
+
+ifeq (,$(JAVA_SDK_ENFORCEMENT_ERROR))
+ JAVA_SDK_ENFORCEMENT_ERROR := APPS
+endif
+
ifeq ($(LOCAL_SDK_VERSION)$(LOCAL_PRIVATE_PLATFORM_APIS),)
ifeq (,$(filter $(LOCAL_MODULE),$(whitelisted_modules)))
ifneq ($(JAVA_SDK_ENFORCEMENT_WARNING)$(JAVA_SDK_ENFORCEMENT_ERROR),)
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index b5cc1b5..1c514cc 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -82,6 +82,13 @@
# please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's
# in the following text file:
# cts/tests/tests/os/assets/platform_versions.txt
+
+# Note that there should be one PLATFORM_VERSION and PLATFORM_VERSION_CODENAME
+# entry for each unreleased API level, regardless of
+# MIN_PLATFORM_VERSION/MAX_PLATFORM_VERSION. PLATFORM_VERSION is used to
+# generate the range of allowed SDK versions, so it must have an entry for every
+# unreleased API level targetable by this branch, not just those that are valid
+# lunch targets for this branch.
PLATFORM_VERSION.QPR1 := Q
# These are the current development codenames, if the build is not a final
diff --git a/target/product/aosp_x86_arm.mk b/target/product/aosp_x86_arm.mk
index 19f57e8..f93f740 100644
--- a/target/product/aosp_x86_arm.mk
+++ b/target/product/aosp_x86_arm.mk
@@ -34,6 +34,7 @@
liblog_arm \
libm_arm \
libmediandk_arm \
+ libamidi_arm \
libOpenMAXAL_arm \
libstdc++_arm \
libOpenSLES_arm \
diff --git a/target/product/base.mk b/target/product/base.mk
index 9511428..f5600ef 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -172,10 +172,13 @@
micro_bench \
perfprofd \
sqlite3 \
- strace
+ strace \
+ sanitizer-status
# Packages included only for eng/userdebug builds, when building with SANITIZE_TARGET=address
-PRODUCT_PACKAGES_DEBUG_ASAN :=
+PRODUCT_PACKAGES_DEBUG_ASAN := \
+ fuzz \
+ honggfuzz
PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\
frameworks/base/config/preloaded-classes:system/etc/preloaded-classes)
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 1849818..10d7979 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -63,6 +63,7 @@
ld.config.txt \
ld.mc \
libaaudio \
+ libamidi \
libOpenMAXAL \
libOpenSLES \
libdownmix \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 48a044b..8e0e42a 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -62,6 +62,7 @@
ld.config.txt \
ld.mc \
libaaudio \
+ libamidi \
libOpenMAXAL \
libOpenSLES \
libdownmix \
diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index c50d653..af65c05 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -29,7 +29,6 @@
LiveWallpapersPicker \
Mms \
Music \
- Protips \
rild \
screenrecord \
SdkSetup \
diff --git a/target/product/vndk/current.txt b/target/product/vndk/current.txt
index 38241f5..2931827 100644
--- a/target/product/vndk/current.txt
+++ b/target/product/vndk/current.txt
@@ -95,6 +95,7 @@
VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
VNDK-core: android.hardware.graphics.composer@2.1.so
VNDK-core: android.hardware.graphics.composer@2.2.so
+VNDK-core: android.hardware.graphics.composer@2.3.so
VNDK-core: android.hardware.health@1.0.so
VNDK-core: android.hardware.health@2.0.so
VNDK-core: android.hardware.ir@1.0.so