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

Commit 6ec41325 authored by Bill Peckham's avatar Bill Peckham Committed by Automerger Merge Worker
Browse files

Merge "Enable prebuilt hiddenapi CSV files." am: ddf8f61c am: c72d8d34 

Original change: https://android-review.googlesource.com/c/platform/build/+/1543720

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba6528b59aa5af4ab66d6d131dec2ef0d79ee007
parents 56bf7ca8 c72d8d34

core/config.mk

+7 −0
Original line number Diff line number Diff line
@@ -990,6 +990,13 @@ $(foreach device,$(call to-upper,$(BOARD_SUPER_PARTITION_BLOCK_DEVICES)), \ 


endif # PRODUCT_USE_DYNAMIC_PARTITIONS



# By default, we build the hidden API csv files from source. You can use

# prebuilt hiddenapi files by setting BOARD_PREBUILT_HIDDENAPI_DIR to the name

# of a directory containing both prebuilt hiddenapi-flags.csv and

# hiddenapi-index.csv.

BOARD_PREBUILT_HIDDENAPI_DIR ?=

.KATI_READONLY := BOARD_PREBUILT_HIDDENAPI_DIR



# ###############################################################

# Set up final options.

# ###############################################################

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ $(call add_json_list, BoardKernelBinaries, $(BOARD_KERNEL_BINARIES)) 
$(call add_json_list, BoardKernelModuleInterfaceVersions, $(BOARD_KERNEL_MODULE_INTERFACE_VERSIONS))



$(call add_json_bool, BoardMoveRecoveryResourcesToVendorBoot, $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT))

$(call add_json_str,  PrebuiltHiddenApiDir, $(BOARD_PREBUILT_HIDDENAPI_DIR))



$(call json_end)