commit dab5aae9390dccda539c2c805904440bc1e41e9e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 11 07:22:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 11 07:22:27 2017 +0000
tree 9894e3a785b600114a64dc67568c80f3db2130f5
parent 8d8ebcaa7d13f163abee5bbf23b4e5a21fbfb44c
parent 5eec8af502bc078421131ee4b127db2405211055

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

camera/ndk/Android.bp

diff --git a/camera/ndk/Android.bp b/camera/ndk/Android.bp
index c5fc646..ade0d72 100644
--- a/camera/ndk/Android.bp
+++ b/camera/ndk/Android.bp
@@ -17,7 +17,7 @@
 // frameworks/av/include.
 
 ndk_library {
-    name: "libcamera2ndk.ndk",
+    name: "libcamera2ndk",
     symbol_file: "libcamera2ndk.map.txt",
     first_version: "24",
     unversioned_until: "current",

media/libaaudio/Android.bp

diff --git a/media/libaaudio/Android.bp b/media/libaaudio/Android.bp
index e41d62b..f539ba9 100644
--- a/media/libaaudio/Android.bp
+++ b/media/libaaudio/Android.bp
@@ -21,7 +21,7 @@
 }
 
 ndk_library {
-    name: "libaaudio.ndk",
+    name: "libaaudio",
     symbol_file: "libaaudio.map.txt",
     first_version: "26",
     unversioned_until: "current",

media/ndk/Android.bp

diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index e4e3d8f..824872f 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -17,7 +17,7 @@
 // frameworks/av/include.
 
 ndk_library {
-    name: "libmediandk.ndk",
+    name: "libmediandk",
     symbol_file: "libmediandk.map.txt",
     first_version: "21",
     unversioned_until: "current",