commit 440c5ac251c4ed9b3f27daa8db8d738087530dbe
author Alec Mouri <alecmouri@google.com> Tue Oct 22 10:30:31 2019 -0700
committer Alec Mouri <alecmouri@google.com> Mon Nov 11 15:38:02 2019 -0800
tree 1c5821a3dd78d945abf9ded32c7342ebbfcce45e
parent e385ff5067eaf8904d4db9c2e7428f6f69685f03

[AChoreographer] Consolidate AChoreographer source files

Now that AChroeographer is defined in libnativedisplay, libandroid
should not need its own copy. Instead what we do is:
* Statically link libnativedisplay into libandroid
* Delete choreographer.cpp

This structure is the same as that of ANativeWindow.

Bug: 136262896
Test: builds
Change-Id: I159d69398bb33ccd7b01aae798d14c04438355c1

native/android/Android.bp

diff --git a/native/android/Android.bp b/native/android/Android.bp
index 91297b0..9d93c9b 100644
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -36,7 +36,6 @@
 
     srcs: [
         "asset_manager.cpp",
-        "choreographer.cpp",
         "configuration.cpp",
         "hardware_buffer_jni.cpp",
         "input.cpp",
@@ -80,7 +79,7 @@
         "libarect",
     ],
 
-    whole_static_libs: ["libnativewindow"],
+    whole_static_libs: ["libnativedisplay", "libnativewindow"],
 
     export_static_lib_headers: ["libarect"],
 
@@ -142,4 +141,4 @@
         "aidl/com/android/internal/compat/IPlatformCompatNative.aidl",
     ],
     path: "aidl",
-}
\ No newline at end of file
+}