| commit | 1a176de2f15392c4789b071d5f05ed6950807a0e | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Nov 04 13:15:11 2016 -0700 |
| committer | Josh Gao <jmgao@google.com> | Fri Nov 04 13:16:29 2016 -0700 |
| tree | 1afc5fb6af2a5136fea70d01247e2f83cd0f3546 | |
| parent | a00e672361893fdaf7e87577e75290523c07d27d [diff] |
versioner: allow static inlines that don't conflict. Bug: http://b/32664285 Test: python run_test.py Change-Id: I9d050e545390eccd82661325c0ec58055f5f28a3
diff --git a/tools/versioner/tests/multiple_definition_ok/headers/bar.h b/tools/versioner/tests/multiple_definition_ok/headers/bar.h new file mode 100644 index 0000000..c3c87bb --- /dev/null +++ b/tools/versioner/tests/multiple_definition_ok/headers/bar.h
@@ -0,0 +1,5 @@ +#if __ANDROID_API__ == 12 +static int foo() { + return 0; +} +#endif
diff --git a/tools/versioner/tests/multiple_definition_ok/headers/foo.h b/tools/versioner/tests/multiple_definition_ok/headers/foo.h new file mode 100644 index 0000000..9da9b2a --- /dev/null +++ b/tools/versioner/tests/multiple_definition_ok/headers/foo.h
@@ -0,0 +1,5 @@ +#if __ANDROID_API__ == 9 +static int foo() { + return 0; +} +#endif
diff --git a/tools/versioner/tests/multiple_definition_ok/platforms/android-9/arch-arm/symbols/libc.so.functions.txt b/tools/versioner/tests/multiple_definition_ok/platforms/android-9/arch-arm/symbols/libc.so.functions.txt new file mode 100644 index 0000000..257cc56 --- /dev/null +++ b/tools/versioner/tests/multiple_definition_ok/platforms/android-9/arch-arm/symbols/libc.so.functions.txt
@@ -0,0 +1 @@ +foo
diff --git a/tools/versioner/tests/multiple_definition_ok/run.sh b/tools/versioner/tests/multiple_definition_ok/run.sh new file mode 100644 index 0000000..e4abbe7 --- /dev/null +++ b/tools/versioner/tests/multiple_definition_ok/run.sh
@@ -0,0 +1 @@ +versioner headers -p platforms -r arm -a 9 -a 12 -i