commit 327763475e83b8997061f7a1db714ac487d36669
author Albert Kong <albertkong@google.com> Thu Jun 23 17:14:44 2022 +0000
committer Albert Kong <albertkong@google.com> Thu Jun 23 17:14:44 2022 +0000
tree b088521c905877955bf57eee5e5396b0905f6028
parent 4580c529395901b072999a320147f4fa2d221489

Fixing master merge error

Test: Manual
Change-Id: I88d11b3688a94d346f803f927b424d632cf23115

adservices/apk/Android.bp

diff --git a/adservices/apk/Android.bp b/adservices/apk/Android.bp
index 853d370..b72e20b 100644
--- a/adservices/apk/Android.bp
+++ b/adservices/apk/Android.bp
@@ -71,14 +71,12 @@
     name: "adservices-assets",
     sdk_version: "module_current",
     static_libs: [
+        "androidx-constraintlayout_constraintlayout",
         "SettingsLibSettingsTheme",
     ],
     asset_dirs: [
         "assets",
     ],
-    static_libs: [
-        "androidx-constraintlayout_constraintlayout",
-    ],
     aaptflags: [
         // Don't compress *.tflite files. Compressed models cannot be loaded on device.
         "-0 .tflite",