diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-08-15 11:04:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-08-15 11:04:14 +0000 |
| commit | 22907b77771aadcae0fa95038a68fee33af38801 (patch) | |
| tree | 95274e88324899cea960e55c633550f710f59682 | |
| parent | 7cf297a7ed4b2c076b90786ae2185f81b6c59395 (diff) | |
| parent | 7b4d76700decba861c840b7938fa709f50d9bcc9 (diff) | |
| download | build-22907b77771aadcae0fa95038a68fee33af38801.tar.gz | |
Merge "Add mainline dev certificate dir to config"
| -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 bf3966a4a7..80828317f0 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)) |