diff options
| author | 2017-04-11 07:22:19 +0000 | |
|---|---|---|
| committer | 2017-04-11 07:22:25 +0000 | |
| commit | c441fbfe434a6af60651eb112040ec58e5fedb64 (patch) | |
| tree | ee02f7d9a6d2cd0079f4574a37fcdff99dd9bc68 | |
| parent | d5de418cf53c50a5a1286bd2c832cbb6a0f52b37 (diff) | |
| parent | 864440943e657fbeafba0013b4de4f4a2f01a9e8 (diff) | |
Merge changes from topic 'llndk_rename' into oc-dev
* changes:
Remove .(ll)ndk suffix from (ll)ndk_library
Remove .(ll)ndk suffix from (ll)ndk_library
| -rw-r--r-- | libs/nativewindow/Android.bp | 2 | ||||
| -rw-r--r-- | opengl/libs/Android.bp | 8 | ||||
| -rw-r--r-- | vulkan/libvulkan/Android.bp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp index 90fb4b617b..6c8221d1de 100644 --- a/libs/nativewindow/Android.bp +++ b/libs/nativewindow/Android.bp @@ -21,7 +21,7 @@ ndk_headers { } ndk_library { - name: "libnativewindow.ndk", + name: "libnativewindow", symbol_file: "libnativewindow.map.txt", // Android O diff --git a/opengl/libs/Android.bp b/opengl/libs/Android.bp index 6a62e8d1ea..a895e63671 100644 --- a/opengl/libs/Android.bp +++ b/opengl/libs/Android.bp @@ -23,28 +23,28 @@ cc_library { // The headers modules are in frameworks/native/opengl/Android.bp. ndk_library { - name: "libEGL.ndk", + name: "libEGL", symbol_file: "libEGL.map.txt", first_version: "9", unversioned_until: "current", } ndk_library { - name: "libGLESv1_CM.ndk", + name: "libGLESv1_CM", symbol_file: "libGLESv1_CM.map.txt", first_version: "9", unversioned_until: "current", } ndk_library { - name: "libGLESv2.ndk", + name: "libGLESv2", symbol_file: "libGLESv2.map.txt", first_version: "9", unversioned_until: "current", } ndk_library { - name: "libGLESv3.ndk", + name: "libGLESv3", symbol_file: "libGLESv3.map.txt", first_version: "18", unversioned_until: "current", diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp index 9444da5f26..68f09c416a 100644 --- a/vulkan/libvulkan/Android.bp +++ b/vulkan/libvulkan/Android.bp @@ -14,7 +14,7 @@ // Headers module is in frameworks/native/vulkan/Android.bp. ndk_library { - name: "libvulkan.ndk", + name: "libvulkan", symbol_file: "libvulkan.map.txt", first_version: "24", unversioned_until: "current", |