diff options
author | Jiyong Park <jiyong@google.com> | 2019-12-19 02:12:15 +0000 |
---|---|---|
committer | Jiyong Park <jiyong@google.com> | 2019-12-19 12:37:49 +0900 |
commit | 955fb9863dc388a2abc40ce1b0d9b5879f75c90d (patch) | |
tree | 12e7d3eb7d7875215907b9df5aed3d9d98b7a130 /fuchsia.mk | |
parent | 2af940b63b71a6aae0b4b8bdf531bc23cebad5bd (diff) | |
download | device_google_fuchsia-955fb9863dc388a2abc40ce1b0d9b5879f75c90d.tar.gz device_google_fuchsia-955fb9863dc388a2abc40ce1b0d9b5879f75c90d.tar.bz2 device_google_fuchsia-955fb9863dc388a2abc40ce1b0d9b5879f75c90d.zip |
Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMARandroid-r-preview-1
Reason for revert: relanding with fix
Reverted Changes:
Ic4119368c:Revert submission 1191937-art_apex_available
Ia084976bb:Revert submission 1191937-art_apex_available
Iada86226d:Revert submission 1191937-art_apex_available
Ic76735eac:Revert submission 1191937-art_apex_available
I1eb30e355:Revert submission 1191937-art_apex_available
Icaf95d260:Revert submission 1191937-art_apex_available
Ie8bace4be:Revert submission 1191937-art_apex_available
I8961702cf:Revert submission 1191937-art_apex_available
I39316f9ef:Revert submission 1191937-art_apex_available
I522a7e83b:Revert submission 1191937-art_apex_available
I8b9424976:Revert submission 1191937-art_apex_available
I48b998629:Revert submission 1191937-art_apex_available
Change-Id: I82fa1f9cc407001ef0c2c808591209c43985786a
Diffstat (limited to 'fuchsia.mk')
-rw-r--r-- | fuchsia.mk | 27 |
1 files changed, 17 insertions, 10 deletions
@@ -27,19 +27,26 @@ PRODUCT_BUILD_RAMDISK_IMAGE := false # default is nosdcard, S/W button enabled in resource PRODUCT_CHARACTERISTICS := nosdcard +art_apex := com.android.art.release +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) + art_apex := com.android.art.debug +endif + # Hand-picked packages. PRODUCT_PACKAGES += \ art-runtime \ - bouncycastle \ - conscrypt \ - core-icu4j \ - core-libart \ - core-oj \ - dalvikvm \ - libart \ - libjavacore \ - libopenjdk \ - okhttp + bouncycastle.$(art_apex) \ + conscrypt.com.android.conscrypt \ + core-icu4j.$(art_apex) \ + core-libart.$(art_apex) \ + core-oj.$(art_apex) \ + dalvikvm.$(art_apex) \ + libart.$(art_apex) \ + libjavacore.$(art_apex) \ + libopenjdk.$(art_apex) \ + okhttp.$(art_apex) + +art_apex := # Fuchsia only has 64-bit support. TARGET_SUPPORTS_32_BIT_APPS := false |