commit 55498fa33bda72b73c2a28fe9335b9919b6afcc4
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 11 16:19:14 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 11 16:19:16 2017 +0000
tree fd506ade3d23cc88dea0f7eaec27bd4db5ab2491
parent 48e2144d1582667529264e06762bbd6f8f142a08
parent 7360384c7f2b6030d926fff6bc9c69a53e11cd67

Merge "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/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",