diff options
| author | Andreas Gampe <agampe@google.com> | 2017-03-31 19:46:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-31 19:46:27 +0000 |
| commit | 542c3d57d0ac2ab918cbb0bb2a361ddf57a52175 (patch) | |
| tree | f7478d47a9a265d23deff5bb0bdedd1eff31b680 | |
| parent | 41b0d9e1464d3719506f84b35d1763436b39083b (diff) | |
| parent | 2c498a391b29a1e84c71040f3f656e5cad5543a0 (diff) | |
| download | build_make-542c3d57d0ac2ab918cbb0bb2a361ddf57a52175.tar.gz build_make-542c3d57d0ac2ab918cbb0bb2a361ddf57a52175.tar.bz2 build_make-542c3d57d0ac2ab918cbb0bb2a361ddf57a52175.zip | |
Merge "Build: Force system owner for ASAN in system"
| -rw-r--r-- | core/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 2ef9842bec..510cd9817a 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1485,10 +1485,12 @@ ASAN_OUT_DIRS_FOR_SYSTEM_INSTALL := $(sort $(patsubst $(PRODUCT_OUT)/%,%,\ $(2ND_TARGET_OUT_SHARED_LIBRARIES) \ $(TARGET_OUT_VENDOR_SHARED_LIBRARIES) \ $(2ND_TARGET_OUT_VENDOR_SHARED_LIBRARIES))) +# Extra options: Enforce the system user for the files to avoid having to change ownership. +ASAN_SYSTEM_INSTALL_OPTIONS := --owner=1000 --group=1000 # Note: experimentally, it seems not worth it to try to get "best" compression. We don't save # enough space. $(ASAN_IN_SYSTEM_INSTALLED): $(INSTALLED_USERDATAIMAGE_TARGET_DEPS) - tar cfj $(ASAN_IN_SYSTEM_INSTALLED) -C $(TARGET_OUT_DATA)/.. $(ASAN_OUT_DIRS_FOR_SYSTEM_INSTALL) >/dev/null + tar cfj $(ASAN_IN_SYSTEM_INSTALLED) $(ASAN_SYSTEM_INSTALL_OPTIONS) -C $(TARGET_OUT_DATA)/.. $(ASAN_OUT_DIRS_FOR_SYSTEM_INSTALL) >/dev/null ####### ## data partition tarball |