commit 1e66ede3b86b559f39bc4390a7d405c4c482ac4c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 13 15:38:16 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 13 15:38:16 2024 -0800
tree 03fa7275b6dbae792711f164ee6b5a3610b5ccc6
parent 66b289cb9255432d412eda60dc8e555156a80aee
parent 0bde9f0ea0da2b42eede9af725b587d913283a43

Merge "Do not build com_android_internal_util_ArrayUtils for host" into main

core/jni/Android.bp

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index e71f607..7935ee5 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -90,7 +90,6 @@
         "android_view_VelocityTracker.cpp",
         "android_view_VerifiedKeyEvent.cpp",
         "android_view_VerifiedMotionEvent.cpp",
-        "com_android_internal_util_ArrayUtils.cpp",
         "com_android_internal_util_VirtualRefBasePtr.cpp",
         "core_jni_helpers.cpp",
         ":deviceproductinfoconstants_aidl",
@@ -271,6 +270,7 @@
                 "com_android_internal_os_ZygoteCommandBuffer.cpp",
                 "com_android_internal_os_ZygoteInit.cpp",
                 "com_android_internal_security_VerityUtils.cpp",
+                "com_android_internal_util_ArrayUtils.cpp",
                 "hwbinder/EphemeralStorage.cpp",
                 "fd_utils.cpp",
                 "android_hardware_input_InputWindowHandle.cpp",