diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-17 07:26:17 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-17 07:26:17 +0000 |
commit | 4fbb36d1db32a098127f5b52bbad7973f9122b24 (patch) | |
tree | 2ea2f9b20980014ad0a756f90acbc95083d07b72 | |
parent | 05f180fbc4271c8c632b7488fa50221ce97ba6b6 (diff) | |
parent | a62adc603a01f5f7ae1e7c8b403d69486d3657bb (diff) | |
download | minijail-4fbb36d1db32a098127f5b52bbad7973f9122b24.tar.gz |
Snap for 4725392 from a62adc603a01f5f7ae1e7c8b403d69486d3657bb to pi-release
Change-Id: I034de66f6b39b5dc2d90b3e3f2728da8a6fa7e12
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | CleanSpec.mk | 51 |
2 files changed, 56 insertions, 0 deletions
@@ -114,7 +114,12 @@ cc_library_static { // ========================================================= cc_library { name: "libminijail", + vendor_available: true, + vndk: { + enabled: true, + }, + defaults: ["libminijail_flags"], srcs: libminijailSrcFiles, diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 0000000..235a2b7 --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,51 @@ +# Copyright (C) 2017 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# If you don't need to do a full clean build but would like to touch +# a file or delete some intermediate files, add a clean step to the end +# of the list. These steps will only be run once, if they haven't been +# run before. +# +# E.g.: +# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) +# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) +# +# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with +# files that are missing or have been moved. +# +# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. +# Use $(OUT_DIR) to refer to the "out" directory. +# +# If you need to re-do something that's already mentioned, just copy +# the command and add it to the bottom of the list. E.g., if a change +# that you made last week required touching a file and a change you +# made today requires touching the same file, just copy the old +# touch step and add it to the end of the list. +# +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ + +# For example: +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) +#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -exec rm -f {} \;) +#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ + +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/libminijail.so) |