From 412a0da66fdf3ca42e58c01a4ce5965569f534a2 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Mon, 16 Aug 2021 13:37:23 -0700 Subject: [PATCH] Most of the TARGET_COPY_OUT_xxx variables are not constant Bug: 193566316 Test: internal Change-Id: I61ec23a927c3b8c340ce1930c88fe1837bdd35d1 --- core/envsetup.rbc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/envsetup.rbc b/core/envsetup.rbc index 451623ba8b..69c4989176 100644 --- a/core/envsetup.rbc +++ b/core/envsetup.rbc @@ -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",