commit c41e05f5f880d8f32f01f0e2fccd202f06754e41
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:26 2017 +0000
tree c548f22c15f5ee8117ecbd6d259159e7fd58cdd5
parent 791691a9e62b45eecf8ada0a7439438b95aa0513
parent f302c68940b9db78a206cf205cf472bdd1a6603c

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

liblog/Android.bp

diff --git a/liblog/Android.bp b/liblog/Android.bp
index bc262db..e74aa82 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -108,14 +108,14 @@
 }
 
 ndk_library {
-    name: "liblog.ndk",
+    name: "liblog",
     symbol_file: "liblog.map.txt",
     first_version: "9",
     unversioned_until: "current",
 }
 
 llndk_library {
-    name: "liblog.llndk",
+    name: "liblog",
     symbol_file: "liblog.map.txt",
     unversioned: true,
     export_include_dirs: ["include_vndk"],

libsync/Android.bp

diff --git a/libsync/Android.bp b/libsync/Android.bp
index b293da4..e7dcf36 100644
--- a/libsync/Android.bp
+++ b/libsync/Android.bp
@@ -7,7 +7,7 @@
 }
 
 ndk_library {
-    name: "libsync.ndk",
+    name: "libsync",
     symbol_file: "libsync.map.txt",
     first_version: "26",
 }