diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-08-15 11:25:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-15 11:25:19 +0000 |
| commit | 78ca0530525cde2ec55598c9e4b7f395ac461a7c (patch) | |
| tree | 2d902cead46b1f1fdcc3581fa0ce8b20b13aae97 | |
| parent | 5bd7543b9845ed9f57de98fe6adfaf54c605b0fb (diff) | |
| parent | 22907b77771aadcae0fa95038a68fee33af38801 (diff) | |
| download | build-78ca0530525cde2ec55598c9e4b7f395ac461a7c.tar.gz | |
Merge "Add mainline dev certificate dir to config" am: 22907b7777
Original change: https://android-review.googlesource.com/c/platform/build/+/2185338
Change-Id: I1cfbe21e29145e2e8e0d5d70db921147467b3684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/config.mk | 1 | ||||
| -rw-r--r-- | core/soong_config.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index 54a4942983..917a777b79 100644 --- a/core/config.mk +++ b/core/config.mk @@ -803,6 +803,7 @@ ifdef PRODUCT_MAINLINE_SEPOLICY_DEV_CERTIFICATES else MAINLINE_SEPOLICY_DEV_CERTIFICATES := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE)) endif +.KATI_READONLY := MAINLINE_SEPOLICY_DEV_CERTIFICATES BUILD_NUMBER_FROM_FILE := $$(cat $(SOONG_OUT_DIR)/build_number.txt) BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) diff --git a/core/soong_config.mk b/core/soong_config.mk index e975d8adc5..28ceebdc34 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -94,6 +94,7 @@ $(call add_json_str, AAPTPreferredConfig, $(PRODUCT_AAPT_PREF_CON $(call add_json_list, AAPTPrebuiltDPI, $(PRODUCT_AAPT_PREBUILT_DPI)) $(call add_json_str, DefaultAppCertificate, $(PRODUCT_DEFAULT_DEV_CERTIFICATE)) +$(call add_json_str, MainlineSepolicyDevCertificates, $(MAINLINE_SEPOLICY_DEV_CERTIFICATES)) $(call add_json_str, AppsDefaultVersionName, $(APPS_DEFAULT_VERSION_NAME)) |