p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make change and version bump to SD2A.210608.001 

Change-Id: I0505fe6f3168daed43020c6bec38c2a9e6e4ec0c
This commit is contained in:
android-build-team Robot 2021-06-08 01:01:19 +00:00
parent 26ae7a8c22 029bd1ca75
commit 196d3599a9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/build_id.mk
View File

@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
BUILD_ID=SD2A.210607.002
BUILD_ID=SD2A.210608.001

8
core/generate_enforce_rro.mk
View File

@ -29,9 +29,12 @@ $(rro_android_manifest_file): build/make/tools/generate-enforce-rro-android-mani
LOCAL_PATH:= $(intermediates)
# TODO(b/187404676): remove this condition when the prebuilt for packges exporting resource exists.
ifeq (,$(TARGET_BUILD_UNBUNDLED))
ifeq ($(enforce_rro_use_res_lib),true)
LOCAL_RES_LIBRARIES := $(enforce_rro_source_module)
endif
endif
LOCAL_FULL_MANIFEST_FILE := $(rro_android_manifest_file)
@ -45,8 +48,9 @@ else ifeq (vendor,$(enforce_rro_partition))
else
$(error Unsupported partition. Want: [vendor/product] Got: [$(enforce_rro_partition)])
endif
ifneq (,$(LOCAL_RES_LIBRARIES))
ifneq (,$(TARGET_BUILD_UNBUNDLED))
LOCAL_SDK_VERSION := current
else ifneq (,$(LOCAL_RES_LIBRARIES))
# Technically we are linking against the app (if only to grab its resources),
# and because it's potentially not building against the SDK, we can't either.
LOCAL_PRIVATE_PLATFORM_APIS := true