Snap for 6630229 from cbaf0a0453af4db3a865a8a3c014762aabc6e867 to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: I59c1146afe4075ce648bf04e3b60e3cf102e3a2c

18 files changed, 31 insertions, 10 deletions

diff --git a/Android.bp b/Android.bp
index a93f70c..38444f4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,12 +14,6 @@
 // limitations under the License.
 //
 
-// We introduce this namespace so that native bridge guest libraries are built
-// only for targets that explicitly use this namespace via PRODUCT_SOONG_NAMESPACES
-// and checkbuild.
-soong_namespace {
-}
-
 cc_defaults {
     name: "native_bridge_stub_library_defaults",
     cflags: [
diff --git a/linker/Android.bp b/linker/Android.bp
index aed9edf..2f47e6e 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -37,16 +37,19 @@ cc_binary {
     ],
 
     enabled: false,
+    target: {
+       native_bridge: {
+           enabled: true,
+       }
+    },
     arch: {
         arm: {
             srcs: ["init_static_tls_arm.S"],
             version_script: "linker.arm.map",
-            enabled: true,
         },
         arm64: {
             srcs: ["init_static_tls_arm64.S"],
             version_script: "linker.generic.map",
-            enabled: true,
         },
     },
 
diff --git a/overriding/Android.bp b/overriding/Android.bp
new file mode 100644
index 0000000..73e4457
--- /dev/null
+++ b/overriding/Android.bp
@@ -0,0 +1,21 @@
+//
+// Copyright (C) 2018 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.
+//
+
+// We introduce this namespace so that native bridge guest libraries are built
+// only for targets that explicitly use this namespace via PRODUCT_SOONG_NAMESPACES
+// and checkbuild.
+soong_namespace {
+}
diff --git a/libc/Android.bp b/overriding/libc/Android.bp
index 1038d8b..1038d8b 100644
--- a/libc/Android.bp
+++ b/overriding/libc/Android.bp
diff --git a/libc/__cxa_thread_atexit_impl.cpp b/overriding/libc/__cxa_thread_atexit_impl.cpp
index 0e4a099..0e4a099 100644
--- a/libc/__cxa_thread_atexit_impl.cpp
+++ b/overriding/libc/__cxa_thread_atexit_impl.cpp
diff --git a/libc/__libc_add_main_thread.cpp b/overriding/libc/__libc_add_main_thread.cpp
index 5dc934d..5dc934d 100644
--- a/libc/__libc_add_main_thread.cpp
+++ b/overriding/libc/__libc_add_main_thread.cpp
diff --git a/libc/exit.c b/overriding/libc/exit.c
index ce6b438..ce6b438 100644
--- a/libc/exit.c
+++ b/overriding/libc/exit.c
diff --git a/libc/fork.cpp b/overriding/libc/fork.cpp
index aedf248..aedf248 100644
--- a/libc/fork.cpp
+++ b/overriding/libc/fork.cpp
diff --git a/libc/malloc_init.cpp b/overriding/libc/malloc_init.cpp
index 76fa5d4..76fa5d4 100644
--- a/libc/malloc_init.cpp
+++ b/overriding/libc/malloc_init.cpp
diff --git a/libc/stubs_arm.cpp b/overriding/libc/stubs_arm.cpp
index 82b02e8..82b02e8 100644
--- a/libc/stubs_arm.cpp
+++ b/overriding/libc/stubs_arm.cpp
diff --git a/libc/stubs_arm64.cpp b/overriding/libc/stubs_arm64.cpp
index 82b02e8..82b02e8 100644
--- a/libc/stubs_arm64.cpp
+++ b/overriding/libc/stubs_arm64.cpp
diff --git a/libicui18n/Android.bp b/overriding/libicui18n/Android.bp
index 1de3561..1de3561 100644
--- a/libicui18n/Android.bp
+++ b/overriding/libicui18n/Android.bp
diff --git a/libicui18n/stubs_arm.cc b/overriding/libicui18n/stubs_arm.cc
index 18a3b30..18a3b30 100644
--- a/libicui18n/stubs_arm.cc
+++ b/overriding/libicui18n/stubs_arm.cc
diff --git a/libicui18n/stubs_arm64.cc b/overriding/libicui18n/stubs_arm64.cc
index 53d248f..53d248f 100644
--- a/libicui18n/stubs_arm64.cc
+++ b/overriding/libicui18n/stubs_arm64.cc
diff --git a/libicuuc/Android.bp b/overriding/libicuuc/Android.bp
index 39fe42c..39fe42c 100644
--- a/libicuuc/Android.bp
+++ b/overriding/libicuuc/Android.bp
diff --git a/libicuuc/stubs_arm.cc b/overriding/libicuuc/stubs_arm.cc
index 6748f8d..6748f8d 100644
--- a/libicuuc/stubs_arm.cc
+++ b/overriding/libicuuc/stubs_arm.cc
diff --git a/libicuuc/stubs_arm64.cc b/overriding/libicuuc/stubs_arm64.cc
index 17dcf16..17dcf16 100644
--- a/libicuuc/stubs_arm64.cc
+++ b/overriding/libicuuc/stubs_arm64.cc
diff --git a/vdso/Android.bp b/vdso/Android.bp
index ba79c51..d93e3db 100644
--- a/vdso/Android.bp
+++ b/vdso/Android.bp
@@ -18,13 +18,16 @@ cc_library_shared {
     name: "libnative_bridge_vdso",
     enabled: false,
     native_bridge_supported: true,
+    target: {
+       native_bridge: {
+           enabled: true,
+       }
+    },
     arch: {
         arm64: {
-            enabled: true,
             srcs: ["vdso_arm64.S"],
         },
         arm: {
-            enabled: true,
             srcs: ["vdso_arm.S"],
         },
     },