Merge "Remove obsolete pm.dexopt properties." into oc-dev am: 64abb10c60
am: 124313d2e1
Change-Id: Icd60ee935aad9553405acbd223406b2ffa89ef10
diff --git a/core/Makefile b/core/Makefile
index 4395469..f7e6920 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -938,10 +938,6 @@
INTERNAL_USERIMAGES_DEPS += $(BLK_ALLOC_TO_BASE_FS)
-INTERNAL_USERIMAGES_DEPS += \
- $(ALL_MODULES.fs_config_dirs.INSTALLED) \
- $(ALL_MODULES.fs_config_files.INSTALLED) \
-
ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true)
INTERNAL_USERIMAGES_DEPS += $(MKE2FS_CONF)
endif
diff --git a/core/static_java_library.mk b/core/static_java_library.mk
index d010f25..69196f4 100644
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -186,9 +186,9 @@
# if we have custom proguarding done use the proguarded classes jar instead of the normal classes jar
ifeq ($(filter custom,$(LOCAL_PROGUARD_ENABLED)),custom)
-aar_classes_jar = $(full_classes_proguard_jar)
-else
aar_classes_jar = $(full_classes_jar)
+else
+aar_classes_jar = $(full_classes_pre_proguard_jar)
endif
# Rule to build AAR, archive including classes.jar, resource, etc.
diff --git a/core/tasks/check_boot_jars/check_boot_jars.py b/core/tasks/check_boot_jars/check_boot_jars.py
index 5a0ec40..1b4540c 100755
--- a/core/tasks/check_boot_jars/check_boot_jars.py
+++ b/core/tasks/check_boot_jars/check_boot_jars.py
@@ -55,7 +55,7 @@
package_name = package_name.replace('/', '.')
# Skip class without a package name
if package_name and not whitelist_re.match(package_name):
- print >> sys.stderr, ('Error: %s: unknown package name of class file %s'
+ print >> sys.stderr, ('Error: %s contains class file %s, which is not in the whitelist'
% (jar, f))
return False
return True
diff --git a/core/tasks/check_boot_jars/package_whitelist.txt b/core/tasks/check_boot_jars/package_whitelist.txt
index 1889117..f25abf9 100644
--- a/core/tasks/check_boot_jars/package_whitelist.txt
+++ b/core/tasks/check_boot_jars/package_whitelist.txt
@@ -202,12 +202,6 @@
android
-
-###################################################
-# telephony-common.jar
-com\.google\..*
-
-
###################################################
# apache-xml.jar
org\.apache\.xml\.res
@@ -238,3 +232,8 @@
org\.apache\.xalan\.processor
org\.apache\.xalan\.transformer
org\.apache\.xalan\.xslt
+
+###################################################
+# Packages in the google namespace across all bootclasspath jars.
+com\.google\.android\..*
+com\.google\.vr\.gvr\..*
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index c0d42e7..324fd24 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -40,7 +40,7 @@
DEFAULT_PLATFORM_VERSION := OPR1
MIN_PLATFORM_VERSION := OPR1
-MAX_PLATFORM_VERSION := OPR1
+MAX_PLATFORM_VERSION := PPR1
ALLOWED_VERSIONS := $(call allowed-platform-versions,\
$(MIN_PLATFORM_VERSION),\
@@ -80,9 +80,11 @@
# please add that PLATFORM_VERSION to the following text file:
# cts/tests/tests/os/assets/platform_versions.txt
PLATFORM_VERSION.OPR1 := O
+PLATFORM_VERSION.PPR1 := P
# These are the current development codenames.
PLATFORM_VERSION_CODENAME.OPR1 := O
+PLATFORM_VERSION_CODENAME.PPR1 := P
ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
diff --git a/envsetup.sh b/envsetup.sh
index 6aaa8c9..b40c2a1 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -225,6 +225,16 @@
fi
export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools:$T/external/selinux/prebuilts/bin
+
+ # add kernel specific binaries
+ case $(uname -s) in
+ Linux)
+ export ANDROID_DEV_SCRIPTS=$ANDROID_DEV_SCRIPTS:$T/prebuilts/misc/linux-x86/dtc:$T/prebuilts/misc/linux-x86/libufdt
+ ;;
+ *)
+ ;;
+ esac
+
export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_TOOLCHAIN:$ANDROID_TOOLCHAIN_2ND_ARCH:$ANDROID_DEV_SCRIPTS:
# If prebuilts/android-emulator/<system>/ exists, prepend it to our PATH
diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk
index d885aa7..c2ae589 100644
--- a/target/product/aosp_arm64_ab.mk
+++ b/target/product/aosp_arm64_ab.mk
@@ -74,7 +74,6 @@
android.hardware.wifi@1.0 \
android.hardware.wifi.supplicant@1.0 \
android.hidl.allocator@1.0 \
- android.hidl.base@1.0 \
android.hidl.manager@1.0 \
android.hidl.memory@1.0 \