commit b01e7f7fd6c3fe164c0d84c309cae22039f71cba
author Dan Willemsen <dwillemsen@google.com> Mon Apr 03 14:28:36 2017 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Apr 05 14:13:55 2017 -0700
tree 009ee35f655619a1b2c95a6721e9d55abc94810c
parent f3d98fbb597ea092907355c8b15290b63606ed73

Support a `vndk` tag in gen_stub_libs.py

This hides a particular symbol from the NDK stubs, while allowing the
symbol to be exposed to the VNDK through the LLNDK stubs. This doesn't
introduce any sort of versioning yet, this will need to change when we
add a new symbol to a new version of the VNDK.

Test: test_gen_stub_libs.py
Test: With my LL-NDK patches, inspecting the generated map files
Change-Id: Iee86aafda7985d6d7a016d0d5ff951505634913b

cc/test_gen_stub_libs.py

diff --git a/cc/test_gen_stub_libs.py b/cc/test_gen_stub_libs.py
index 8683d31..8611ef3 100755
--- a/cc/test_gen_stub_libs.py
+++ b/cc/test_gen_stub_libs.py
@@ -107,27 +107,39 @@
 
 class OmitVersionTest(unittest.TestCase):
     def test_omit_private(self):
-        self.assertFalse(gsl.should_omit_version('foo', [], 'arm', 9))
-
-        self.assertTrue(gsl.should_omit_version('foo_PRIVATE', [], 'arm', 9))
-        self.assertTrue(gsl.should_omit_version('foo_PLATFORM', [], 'arm', 9))
+        self.assertFalse(gsl.should_omit_version('foo', [], 'arm', 9, False))
 
         self.assertTrue(gsl.should_omit_version(
-            'foo', ['platform-only'], 'arm', 9))
+            'foo_PRIVATE', [], 'arm', 9, False))
+        self.assertTrue(gsl.should_omit_version(
+            'foo_PLATFORM', [], 'arm', 9, False))
+
+        self.assertTrue(gsl.should_omit_version(
+            'foo', ['platform-only'], 'arm', 9, False))
+
+    def test_omit_vndk(self):
+        self.assertTrue(gsl.should_omit_version(
+            'foo', ['vndk'], 'arm', 9, False))
+
+        self.assertFalse(gsl.should_omit_version('foo', [], 'arm', 9, True))
+        self.assertFalse(gsl.should_omit_version(
+            'foo', ['vndk'], 'arm', 9, True))
 
     def test_omit_arch(self):
-        self.assertFalse(gsl.should_omit_version('foo', [], 'arm', 9))
-        self.assertFalse(gsl.should_omit_version('foo', ['arm'], 'arm', 9))
+        self.assertFalse(gsl.should_omit_version('foo', [], 'arm', 9, False))
+        self.assertFalse(gsl.should_omit_version(
+            'foo', ['arm'], 'arm', 9, False))
 
-        self.assertTrue(gsl.should_omit_version('foo', ['x86'], 'arm', 9))
+        self.assertTrue(gsl.should_omit_version(
+            'foo', ['x86'], 'arm', 9, False))
 
     def test_omit_api(self):
-        self.assertFalse(gsl.should_omit_version('foo', [], 'arm', 9))
+        self.assertFalse(gsl.should_omit_version('foo', [], 'arm', 9, False))
         self.assertFalse(
-            gsl.should_omit_version('foo', ['introduced=9'], 'arm', 9))
+            gsl.should_omit_version('foo', ['introduced=9'], 'arm', 9, False))
 
         self.assertTrue(
-            gsl.should_omit_version('foo', ['introduced=14'], 'arm', 9))
+            gsl.should_omit_version('foo', ['introduced=14'], 'arm', 9, False))
 
 
 class SymbolFileParseTest(unittest.TestCase):
@@ -302,7 +314,7 @@
         # OmitVersionTest, PrivateVersionTest, and SymbolPresenceTest.
         src_file = cStringIO.StringIO()
         version_file = cStringIO.StringIO()
-        generator = gsl.Generator(src_file, version_file, 'arm', 9)
+        generator = gsl.Generator(src_file, version_file, 'arm', 9, False)
 
         version = gsl.Version('VERSION_PRIVATE', None, [], [
             gsl.Symbol('foo', []),
@@ -330,7 +342,7 @@
         # SymbolPresenceTest.
         src_file = cStringIO.StringIO()
         version_file = cStringIO.StringIO()
-        generator = gsl.Generator(src_file, version_file, 'arm', 9)
+        generator = gsl.Generator(src_file, version_file, 'arm', 9, False)
 
         version = gsl.Version('VERSION_1', None, [], [
             gsl.Symbol('foo', ['x86']),
@@ -346,10 +358,17 @@
         self.assertEqual('', src_file.getvalue())
         self.assertEqual('', version_file.getvalue())
 
+        version = gsl.Version('VERSION_1', None, [], [
+            gsl.Symbol('foo', ['vndk']),
+        ])
+        generator.write_version(version)
+        self.assertEqual('', src_file.getvalue())
+        self.assertEqual('', version_file.getvalue())
+
     def test_write(self):
         src_file = cStringIO.StringIO()
         version_file = cStringIO.StringIO()
-        generator = gsl.Generator(src_file, version_file, 'arm', 9)
+        generator = gsl.Generator(src_file, version_file, 'arm', 9, False)
 
         versions = [
             gsl.Version('VERSION_1', None, [], [
@@ -410,6 +429,7 @@
 
             VERSION_4 { # versioned=9
                 wibble;
+                wizzes; # vndk
             } VERSION_2;
 
             VERSION_5 { # versioned=14
@@ -421,7 +441,7 @@
 
         src_file = cStringIO.StringIO()
         version_file = cStringIO.StringIO()
-        generator = gsl.Generator(src_file, version_file, 'arm', 9)
+        generator = gsl.Generator(src_file, version_file, 'arm', 9, False)
         generator.write(versions)
 
         expected_src = textwrap.dedent("""\