From 70edfa8c31309032b27277f1b897a374dbbd6f23 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Fri, 14 Dec 2018 15:46:27 -0800
Subject: [bit] Use aapt2 instead of aapt, and don't also adb install apps on
 the system partition

Test: bit services
Change-Id: I7d44ffbb2745b1a6265bbc77f24f885e5f1d3981
---
 tools/bit/main.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'tools/bit/main.cpp')

diff --git a/tools/bit/main.cpp b/tools/bit/main.cpp
index 678af7f1c72b..860094aef1f4 100644
--- a/tools/bit/main.cpp
+++ b/tools/bit/main.cpp
@@ -662,6 +662,7 @@ run_phases(vector<Target*> targets, const Options& options)
     string dataPath = buildOut + "/target/product/" + buildDevice + "/data/";
     bool syncSystem = false;
     bool alwaysSyncSystem = false;
+    vector<string> systemFiles;
     vector<InstallApk> installApks;
     for (size_t i=0; i<targets.size(); i++) {
         Target* target = targets[i];
@@ -671,6 +672,7 @@ run_phases(vector<Target*> targets, const Options& options)
                 // System partition
                 if (starts_with(file, systemPath)) {
                     syncSystem = true;
+                    systemFiles.push_back(file);
                     if (!target->build) {
                         // If a system partition target didn't get built then
                         // it won't change we will always need to do adb sync
@@ -693,6 +695,19 @@ run_phases(vector<Target*> targets, const Options& options)
         get_directory_contents(systemPath, &systemFilesBefore);
     }
 
+    if (systemFiles.size() > 0){
+        print_info("System files:");
+        for (size_t i=0; i<systemFiles.size(); i++) {
+            printf("  %s\n", systemFiles[i].c_str());
+        }
+    }
+    if (installApks.size() > 0){
+        print_info("APKs to install:");
+        for (size_t i=0; i<installApks.size(); i++) {
+            printf("  %s\n", installApks[i].file.filename.c_str());
+        }
+    }
+
     //
     // Build
     //
@@ -799,7 +814,8 @@ run_phases(vector<Target*> targets, const Options& options)
             for (size_t j=0; j<target->module.installed.size(); j++) {
                 string filename = target->module.installed[j];
 
-                if (!ends_with(filename, ".apk")) {
+                // Apk in the data partition
+                if (!starts_with(filename, dataPath) || !ends_with(filename, ".apk")) {
                     continue;
                 }
 
-- 
cgit v1.2.3-59-g8ed1b