Merge "Add "android.software.preview_sdk" feature" into oc-dev

am: 89f74db432

Change-Id: I6dc6a8361400d36e52b47b12f4267739575bca37
This commit is contained in:
Justin Klaassen 2017-04-14 22:44:00 +00:00 committed by android-build-merger
commit 16c24c350b
1 changed files with 5 additions and 0 deletions

View File

@ -90,6 +90,11 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml
ifneq (REL,$(PLATFORM_VERSION_CODENAME))
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.preview_sdk.xml:system/etc/permissions/android.software.preview_sdk.xml
endif
# The order of PRODUCT_BOOT_JARS matters. # The order of PRODUCT_BOOT_JARS matters.
PRODUCT_BOOT_JARS := \ PRODUCT_BOOT_JARS := \
core-oj \ core-oj \