commit 6dbf9eca35bcaa752a6758d3127c233f8b7687e3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 03 23:44:06 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 03 23:44:06 2019 +0000
tree ccf20a26a36b822a2d394df4a7d90341a49396eb
parent bec232eb2f07d53c4dbf510b3fbb80f092d02681
parent 73030ed317f0f8b0a1c25919970f7a20179efa2d

Merge "art_cc_static_library -> art_cc_library_static"

build/art.go

diff --git a/build/art.go b/build/art.go
index 01848c8..22f6410 100644
--- a/build/art.go
+++ b/build/art.go
@@ -282,7 +282,7 @@
 
 func init() {
 	android.RegisterModuleType("art_cc_library", artLibrary)
-	android.RegisterModuleType("art_cc_static_library", artStaticLibrary)
+	android.RegisterModuleType("art_cc_library_static", artStaticLibrary)
 	android.RegisterModuleType("art_cc_binary", artBinary)
 	android.RegisterModuleType("art_cc_test", artTest)
 	android.RegisterModuleType("art_cc_test_library", artTestLibrary)

dex2oat/Android.bp

diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index f8bdb16..3a2ae75 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -114,7 +114,7 @@
     output_extension: "operator_out.cc",
 }
 
-art_cc_static_library {
+art_cc_library_static {
     name: "libart-dex2oat",
     defaults: ["libart-dex2oat-defaults"],
     shared_libs: [
@@ -139,7 +139,7 @@
     ],
 }
 
-art_cc_static_library {
+art_cc_library_static {
     name: "libartd-dex2oat",
     defaults: [
         "art_debug_defaults",