Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d8b8125 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master

parents 207e7372 b461e822

core/android_soong_config_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ else 
  # This sets the default for building ART APEXes from source rather than

  # prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in

  # all other platform builds.

  SOONG_CONFIG_art_module_source_build ?= false

  SOONG_CONFIG_art_module_source_build ?= true

endif



# Apex build mode variables

target/product/gsi_release.mk

+6 −2
Original line number Diff line number Diff line
@@ -62,8 +62,12 @@ PRODUCT_PACKAGES += \ 
    init.gsi.rc \

    init.vndk-nodef.rc \



# Support additional P, Q and R VNDK packages

PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30

# Support additional VNDK snapshots

PRODUCT_EXTRA_VNDK_VERSIONS := \

    28 \

    29 \

    30 \

    31 \



# Do not build non-GSI partition images.

PRODUCT_BUILD_CACHE_IMAGE := false

core/version_defaults.mk

+1 −1

File changed.

Contains only whitespace changes.