diff options
| author | Jihoon Kang <jihoonkang@google.com> | 2023-10-03 18:02:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-03 18:02:14 +0000 |
| commit | 078aa1a5eea7917839718f767841b1f3d9fa7c54 (patch) | |
| tree | c141163c2d5ef4aea7831b2067565ad78d9b17f2 | |
| parent | de693db32978b16ae000690728c417c4cb7ff65a (diff) | |
| parent | a65cdd502474e61e7d7582189a6524bdbc7d688e (diff) | |
| download | build-078aa1a5eea7917839718f767841b1f3d9fa7c54.tar.gz | |
Merge "Revert^2 "Add soong config variable Release_expose_flagged_api"" into main am: a65cdd5024
Original change: https://android-review.googlesource.com/c/platform/build/+/2768376
Change-Id: I606e80325d05f52132acf1d940f362649817e141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/soong_config.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/soong_config.mk b/core/soong_config.mk index b172ec2bf6..d50ba8e104 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -40,7 +40,9 @@ $(call add_json_str, Platform_preview_sdk_version, $(PLATFORM_PREVIEW_SDK_ $(call add_json_str, Platform_base_os, $(PLATFORM_BASE_OS)) $(call add_json_str, Platform_version_last_stable, $(PLATFORM_VERSION_LAST_STABLE)) $(call add_json_str, Platform_version_known_codenames, $(PLATFORM_VERSION_KNOWN_CODENAMES)) + $(call add_json_bool, Release_aidl_use_unfrozen, $(RELEASE_AIDL_USE_UNFROZEN)) +$(call add_json_bool, Release_expose_flagged_api, $(RELEASE_EXPOSE_FLAGGED_API)) $(call add_json_str, Platform_min_supported_target_sdk_version, $(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION)) |