commit 8f6839c1ab8f5cd4588d49a0044b6963b20e308c
author Martin Stjernholm <mast@google.com> Tue Feb 05 15:06:45 2019 +0000
committer Martin Stjernholm <mast@google.com> Thu Feb 07 15:23:49 2019 +0000
tree 36e5cd2607ce27949e2e6af0c0b160f3973c6a3e
parent 033f88713f30cec8e32a1d93b7964fba211b0b28

Revert^3 "Remove stubs for libnativehelper."

This reverts commit 2ff21fd097060b5207e07bf46d7988e8e68fb642.

Reason for revert: Another try with http://r.android.com/892234 in place.

Test: Flash and boot
Test: mmma libnativehelper
Test: atest -a libnativehelper/tests
Test: atest CtsJdwpTestCases
Bug: 113373927
Change-Id: I406c7c1f3981a2b9c9e751e8eb6ecb979d195a5d

Android.bp

diff --git a/Android.bp b/Android.bp
index c258e71..06f096e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,8 +31,8 @@
     export_include_dirs: ["platform_include"],
 }
 
-cc_defaults {
-    name: "libnativehelper_defaults",
+cc_library {
+    name: "libnativehelper",
     host_supported: true,
     srcs: [
         "JNIHelp.cpp",
@@ -48,15 +48,14 @@
         "-fvisibility=protected",
     ],
     export_include_dirs: [
-         "include",
-         "header_only_include",
-         "platform_include"
+        "include",
+        "header_only_include",
+        "platform_include"
     ],
-}
-
-cc_library {
-    name: "libnativehelper",
-    defaults: [ "libnativehelper_defaults" ],
+    stubs: {
+        symbol_file: "libnativehelper.map.txt",
+        versions: ["1"],
+    },
 }
 
 //