From 139b977faed3efce2e81ed3b8ebc7faf7637e81b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 11 May 2021 18:56:41 +0000 Subject: [PATCH] Remove "cp $(out) ." from genrule $(out) is the correct location for the output, and "." is the root of the source tree. Remove "cp $(out) ." to avoid writing to the source tree. Bug: 185211826 Change-Id: I71d961d885e450641773de3299ce6f1014b8ce92 Test: treehugger --- core/res/Android.bp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/res/Android.bp b/core/res/Android.bp index b988b5a92af78..60630626fb680 100644 --- a/core/res/Android.bp +++ b/core/res/Android.bp @@ -100,8 +100,7 @@ genrule { + "RES_DIR=$$(dirname $$(dirname $${INPUTS[0]})) && " + "mkdir -p $$RES_DIR/values && " + "cp $${INPUTS[1]} $$RES_DIR/values && " - + "$(location soong_zip) -o $(out) -C $$RES_DIR -D $$RES_DIR && " - + "cp $(out) ." + + "$(location soong_zip) -o $(out) -C $$RES_DIR -D $$RES_DIR" } android_app {