StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Most of the TARGET_COPY_OUT_xxx variables are not constant" am: 82d34b6472

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1797188

Change-Id: I4b5e7319e8bf3691393f06c0dfc7aeab40ce9818
This commit is contained in:
Treehugger Robot
2021-08-17 13:17:02 +00:00
committed by Automerger Merge Worker
parent c4bf3e5725 82d34b6472
commit f26cd53f1c
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/envsetup.rbc
View File

@@ -188,9 +188,18 @@ def init(g):
if g["HOST_BUILD_TYPE"] not in ["release", "debug"]:
fail("HOST_BUILD_TYPE must be either release or debug, not '%s'" % g["HOST_BUILD_TYPE"])
g.update([
("TARGET_COPY_OUT_VENDOR", "||VENDOR-PATH-PH||"),
("TARGET_COPY_OUT_PRODUCT", "||PRODUCT-PATH-PH||"),
("TARGET_COPY_OUT_PRODUCT_SERVICES", "||PRODUCT-PATH-PH||"),
("TARGET_COPY_OUT_SYSTEM_EXT", "||SYSTEM_EXT-PATH-PH||"),
("TARGET_COPY_OUT_ODM", "||ODM-PATH-PH||"),
("TARGET_COPY_OUT_VENDOR_DLKM", "||VENDOR_DLKM-PATH-PH||"),
("TARGET_COPY_OUT_ODM_DLKM", "||ODM_DLKM-PATH-PH||"),
])
# TODO(asmundak): there is more stuff in envsetup.mk lines 249-292, but
# it does not seem to affect product configuration. Revisit this.
g["ART_APEX_JARS"] = [
"com.android.art:core-oj",
"com.android.art:core-libart",