Merge "Replaced android.dvr.composer@1.0 with android.frameworks.vr.composer@1.0" into oc-dev
diff --git a/core/install_jni_libs.mk b/core/install_jni_libs.mk
index 625a8a2..6b550c1 100644
--- a/core/install_jni_libs.mk
+++ b/core/install_jni_libs.mk
@@ -18,9 +18,19 @@
ifneq ($(filter tests samples, $(LOCAL_MODULE_TAGS)),)
my_embed_jni := true
endif
-ifeq ($(filter $(TARGET_OUT)/% $(TARGET_OUT_VENDOR)/% $(TARGET_OUT_OEM)/%, $(my_module_path)),)
-# If this app isn't to be installed to system partitions.
-my_embed_jni := true
+ifeq ($(PRODUCT_FULL_TREBLE),true)
+ ifeq ($(filter $(TARGET_OUT)/%, $(my_module_path)),)
+ # If this app isn't to be installed to the system partition, and the device
+ # is fully treble-ized then jni libs are embedded, Otherwise, access to the
+ # directory where the lib is installed to (usually /vendor/lib) needs to be
+ # allowed for system processes, which is a Treble violation.
+ my_embed_jni := true
+ endif
+else
+ ifeq ($(filter $(TARGET_OUT)/% $(TARGET_OUT_VENDOR)/% $(TARGET_OUT_OEM)/%, $(my_module_path)),)
+ # If this app isn't to be installed to system, vendor, or oem partitions.
+ my_embed_jni := true
+ endif
endif
jni_shared_libraries :=
diff --git a/target/product/base.mk b/target/product/base.mk
index f449c39..89a2aaa 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -141,6 +141,10 @@
PRODUCT_PACKAGES += \
android.hardware.media.omx@1.0-service
+# XML schema files
+PRODUCT_PACKAGES += \
+ media_profiles_V1_0.dtd
+
# Packages included only for eng or userdebug builds, previously debug tagged
PRODUCT_PACKAGES_DEBUG := \
perfprofd
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 4786b43..7bf16f5 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -44,6 +44,8 @@
SettingsProvider \
Shell \
WallpaperBackup \
+ android.hidl.base-V1.0-java \
+ android.hidl.manager-V1.0-java \
bcc \
bu \
com.android.location.provider \
@@ -98,7 +100,9 @@
ims-common \
apache-xml \
nullwebview \
- org.apache.http.legacy.boot
+ org.apache.http.legacy.boot \
+ android.hidl.base-V1.0-java \
+ android.hidl.manager-V1.0-java
# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
PRODUCT_SYSTEM_SERVER_JARS := \