From 51a9bf16733595fcd7ffcde3cd3832262516a390 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 7 Apr 2017 14:09:18 -0700
Subject: [PATCH] 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  | 6 +++---
 libdl/Android.bp | 4 ++--
 libm/Android.bp  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libc/Android.bp b/libc/Android.bp
index 72699f5eb..688dd61b8 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2177,13 +2177,13 @@ ndk_headers {
 }
 
 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 @@ llndk_library {
 }
 
 ndk_library {
-    name: "libstdc++.ndk",
+    name: "libstdc++",
     symbol_file: "libstdc++.map.txt",
     first_version: "9",
 }
diff --git a/libdl/Android.bp b/libdl/Android.bp
index 8c6b47e69..ffdf7f787 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -120,12 +120,12 @@ cc_library {
 }
 
 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",
 }
diff --git a/libm/Android.bp b/libm/Android.bp
index 24e641c94..07d42610b 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -534,12 +534,12 @@ cc_library {
 }
 
 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",
 }