commit 51a9bf16733595fcd7ffcde3cd3832262516a390
author Dan Willemsen <dwillemsen@google.com> Fri Apr 07 14:09:18 2017 -0700
committer Steven Moreland <smoreland@google.com> Tue Apr 11 15:15:30 2017 +0000
tree f9c293c54697c4169cebeb36d696ee4bb6456991
parent df244d876a5da87161e550147cc03c4373b49ca6

Remove .(ll)ndk suffix from (ll)ndk_library

Soong handles these automatically now.

Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Merged-In: Ibfe4cf5db732d9007b1cc12dbc523c427de1b23d
Change-Id: Ibfe4cf5db732d9007b1cc12dbc523c427de1b23d

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 72699f5..688dd61 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2177,13 +2177,13 @@
 }
 
 ndk_library {
-    name: "libc.ndk",
+    name: "libc",
     symbol_file: "libc.map.txt",
     first_version: "9",
 }
 
 llndk_library {
-    name: "libc.llndk",
+    name: "libc",
     symbol_file: "libc.map.txt",
     export_headers_as_system: true,
     export_preprocessed_headers: ["include"],
@@ -2240,7 +2240,7 @@
 }
 
 ndk_library {
-    name: "libstdc++.ndk",
+    name: "libstdc++",
     symbol_file: "libstdc++.map.txt",
     first_version: "9",
 }

libdl/Android.bp

diff --git a/libdl/Android.bp b/libdl/Android.bp
index 8c6b47e..ffdf7f7 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -120,12 +120,12 @@
 }
 
 ndk_library {
-    name: "libdl.ndk",
+    name: "libdl",
     symbol_file: "libdl.map.txt",
     first_version: "9",
 }
 
 llndk_library {
-    name: "libdl.llndk",
+    name: "libdl",
     symbol_file: "libdl.map.txt",
 }

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index 24e641c..07d4261 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -534,12 +534,12 @@
 }
 
 ndk_library {
-    name: "libm.ndk",
+    name: "libm",
     symbol_file: "libm.map.txt",
     first_version: "9",
 }
 
 llndk_library {
-    name: "libm.llndk",
+    name: "libm",
     symbol_file: "libm.map.txt",
 }