Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467 Merged-In: I42fd618b5a018abd57e6eab4fe4ed6ba9f70a235 Change-Id: I5e0d686c2a1cc15e6a3115243f3a83cb070b111c
This commit is contained in:
@@ -88,7 +88,7 @@ else
|
|||||||
# This sets the default for building ART APEXes from source rather than
|
# This sets the default for building ART APEXes from source rather than
|
||||||
# prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in
|
# prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in
|
||||||
# all other platform builds.
|
# all other platform builds.
|
||||||
SOONG_CONFIG_art_module_source_build ?= false
|
SOONG_CONFIG_art_module_source_build ?= true
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Apex build mode variables
|
# Apex build mode variables
|
||||||
|
@@ -62,8 +62,12 @@ PRODUCT_PACKAGES += \
|
|||||||
init.gsi.rc \
|
init.gsi.rc \
|
||||||
init.vndk-nodef.rc \
|
init.vndk-nodef.rc \
|
||||||
|
|
||||||
# Support additional P, Q and R VNDK packages
|
# Support additional VNDK snapshots
|
||||||
PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30
|
PRODUCT_EXTRA_VNDK_VERSIONS := \
|
||||||
|
28 \
|
||||||
|
29 \
|
||||||
|
30 \
|
||||||
|
31 \
|
||||||
|
|
||||||
# Do not build non-GSI partition images.
|
# Do not build non-GSI partition images.
|
||||||
PRODUCT_BUILD_CACHE_IMAGE := false
|
PRODUCT_BUILD_CACHE_IMAGE := false
|
||||||
|
Reference in New Issue
Block a user