Merge "Remove intermediate src dir"
diff --git a/javatests/Android.bp b/javatests/Android.bp
index fae1c13..e89738a 100644
--- a/javatests/Android.bp
+++ b/javatests/Android.bp
@@ -21,7 +21,7 @@
defaults: ["tradefed_defaults"],
// Only compile source java files in this lib.
- srcs: ["src/**/*.java"],
+ srcs: ["com/**/*.java"],
static_libs: [
"loganalysis",
diff --git a/javatests/src/com/android/loganalysis/item/BatteryDischargeItemTest.java b/javatests/com/android/loganalysis/item/BatteryDischargeItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/BatteryDischargeItemTest.java
rename to javatests/com/android/loganalysis/item/BatteryDischargeItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/BatteryUsageItemTest.java b/javatests/com/android/loganalysis/item/BatteryUsageItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/BatteryUsageItemTest.java
rename to javatests/com/android/loganalysis/item/BatteryUsageItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/DumpsysPackageStatsItemTest.java b/javatests/com/android/loganalysis/item/DumpsysPackageStatsItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/DumpsysPackageStatsItemTest.java
rename to javatests/com/android/loganalysis/item/DumpsysPackageStatsItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/DvmLockSampleItemTest.java b/javatests/com/android/loganalysis/item/DvmLockSampleItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/DvmLockSampleItemTest.java
rename to javatests/com/android/loganalysis/item/DvmLockSampleItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/GenericItemTest.java b/javatests/com/android/loganalysis/item/GenericItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/GenericItemTest.java
rename to javatests/com/android/loganalysis/item/GenericItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/InterruptItemTest.java b/javatests/com/android/loganalysis/item/InterruptItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/InterruptItemTest.java
rename to javatests/com/android/loganalysis/item/InterruptItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/LocationDumpsItemTest.java b/javatests/com/android/loganalysis/item/LocationDumpsItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/LocationDumpsItemTest.java
rename to javatests/com/android/loganalysis/item/LocationDumpsItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/MemInfoItemTest.java b/javatests/com/android/loganalysis/item/MemInfoItemTest.java
similarity index 96%
rename from javatests/src/com/android/loganalysis/item/MemInfoItemTest.java
rename to javatests/com/android/loganalysis/item/MemInfoItemTest.java
index 7f25fe3..3a8f307 100644
--- a/javatests/src/com/android/loganalysis/item/MemInfoItemTest.java
+++ b/javatests/com/android/loganalysis/item/MemInfoItemTest.java
@@ -30,8 +30,8 @@
*/
public void testToJson() throws JSONException {
MemInfoItem item = new MemInfoItem();
- item.put("foo", 123l);
- item.put("bar", 456l);
+ item.put("foo", 123L);
+ item.put("bar", 456L);
item.setText("foo: 123 kB\nbar: 456 kB");
// Convert to JSON string and back again
diff --git a/javatests/src/com/android/loganalysis/item/MonkeyLogItemTest.java b/javatests/com/android/loganalysis/item/MonkeyLogItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/MonkeyLogItemTest.java
rename to javatests/com/android/loganalysis/item/MonkeyLogItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/ProcrankItemTest.java b/javatests/com/android/loganalysis/item/ProcrankItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/ProcrankItemTest.java
rename to javatests/com/android/loganalysis/item/ProcrankItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/SmartMonkeyLogItemTest.java b/javatests/com/android/loganalysis/item/SmartMonkeyLogItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/SmartMonkeyLogItemTest.java
rename to javatests/com/android/loganalysis/item/SmartMonkeyLogItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/SystemPropsItemTest.java b/javatests/com/android/loganalysis/item/SystemPropsItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/SystemPropsItemTest.java
rename to javatests/com/android/loganalysis/item/SystemPropsItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/TopItemTest.java b/javatests/com/android/loganalysis/item/TopItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/TopItemTest.java
rename to javatests/com/android/loganalysis/item/TopItemTest.java
diff --git a/javatests/src/com/android/loganalysis/item/WakelockItemTest.java b/javatests/com/android/loganalysis/item/WakelockItemTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/item/WakelockItemTest.java
rename to javatests/com/android/loganalysis/item/WakelockItemTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/AbstractSectionParserTest.java b/javatests/com/android/loganalysis/parser/AbstractSectionParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/AbstractSectionParserTest.java
rename to javatests/com/android/loganalysis/parser/AbstractSectionParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/ActivityServiceParserTest.java b/javatests/com/android/loganalysis/parser/ActivityServiceParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/ActivityServiceParserTest.java
rename to javatests/com/android/loganalysis/parser/ActivityServiceParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/AnrParserTest.java b/javatests/com/android/loganalysis/parser/AnrParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/AnrParserTest.java
rename to javatests/com/android/loganalysis/parser/AnrParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BatteryDischargeStatsInfoParserTest.java b/javatests/com/android/loganalysis/parser/BatteryDischargeStatsInfoParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/BatteryDischargeStatsInfoParserTest.java
rename to javatests/com/android/loganalysis/parser/BatteryDischargeStatsInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BatteryStatsDetailedInfoParserTest.java b/javatests/com/android/loganalysis/parser/BatteryStatsDetailedInfoParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/BatteryStatsDetailedInfoParserTest.java
rename to javatests/com/android/loganalysis/parser/BatteryStatsDetailedInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java b/javatests/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java
rename to javatests/com/android/loganalysis/parser/BatteryStatsSummaryInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BatteryUsageParserTest.java b/javatests/com/android/loganalysis/parser/BatteryUsageParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/BatteryUsageParserTest.java
rename to javatests/com/android/loganalysis/parser/BatteryUsageParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/BugreportParserTest.java b/javatests/com/android/loganalysis/parser/BugreportParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/BugreportParserTest.java
rename to javatests/com/android/loganalysis/parser/BugreportParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/CompactMemInfoParserTest.java b/javatests/com/android/loganalysis/parser/CompactMemInfoParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/CompactMemInfoParserTest.java
rename to javatests/com/android/loganalysis/parser/CompactMemInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/CpuInfoParserTest.java b/javatests/com/android/loganalysis/parser/CpuInfoParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/CpuInfoParserTest.java
rename to javatests/com/android/loganalysis/parser/CpuInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DmesgParserTest.java b/javatests/com/android/loganalysis/parser/DmesgParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/DmesgParserTest.java
rename to javatests/com/android/loganalysis/parser/DmesgParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java
rename to javatests/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysPackageStatsParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysPackageStatsParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/DumpsysPackageStatsParserTest.java
rename to javatests/com/android/loganalysis/parser/DumpsysPackageStatsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/DumpsysParserTest.java
rename to javatests/com/android/loganalysis/parser/DumpsysParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysProcStatsParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysProcStatsParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/DumpsysProcStatsParserTest.java
rename to javatests/com/android/loganalysis/parser/DumpsysProcStatsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysProcessMeminfoParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysProcessMeminfoParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/DumpsysProcessMeminfoParserTest.java
rename to javatests/com/android/loganalysis/parser/DumpsysProcessMeminfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DumpsysWifiStatsParserTest.java b/javatests/com/android/loganalysis/parser/DumpsysWifiStatsParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/DumpsysWifiStatsParserTest.java
rename to javatests/com/android/loganalysis/parser/DumpsysWifiStatsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/DvmLockSampleParserTest.java b/javatests/com/android/loganalysis/parser/DvmLockSampleParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/DvmLockSampleParserTest.java
rename to javatests/com/android/loganalysis/parser/DvmLockSampleParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/EventsLogParserTest.java b/javatests/com/android/loganalysis/parser/EventsLogParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/EventsLogParserTest.java
rename to javatests/com/android/loganalysis/parser/EventsLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/GfxInfoParserTest.java b/javatests/com/android/loganalysis/parser/GfxInfoParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/GfxInfoParserTest.java
rename to javatests/com/android/loganalysis/parser/GfxInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/InterruptParserTest.java b/javatests/com/android/loganalysis/parser/InterruptParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/InterruptParserTest.java
rename to javatests/com/android/loganalysis/parser/InterruptParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/JavaCrashParserTest.java b/javatests/com/android/loganalysis/parser/JavaCrashParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/JavaCrashParserTest.java
rename to javatests/com/android/loganalysis/parser/JavaCrashParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/KernelLogParserTest.java b/javatests/com/android/loganalysis/parser/KernelLogParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/KernelLogParserTest.java
rename to javatests/com/android/loganalysis/parser/KernelLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/LocationServiceParserTest.java b/javatests/com/android/loganalysis/parser/LocationServiceParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/LocationServiceParserTest.java
rename to javatests/com/android/loganalysis/parser/LocationServiceParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/LogcatParserTest.java b/javatests/com/android/loganalysis/parser/LogcatParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/LogcatParserTest.java
rename to javatests/com/android/loganalysis/parser/LogcatParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/MemHealthParserTest.java b/javatests/com/android/loganalysis/parser/MemHealthParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/MemHealthParserTest.java
rename to javatests/com/android/loganalysis/parser/MemHealthParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/MemInfoParserTest.java b/javatests/com/android/loganalysis/parser/MemInfoParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/MemInfoParserTest.java
rename to javatests/com/android/loganalysis/parser/MemInfoParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/MonkeyLogParserTest.java b/javatests/com/android/loganalysis/parser/MonkeyLogParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/MonkeyLogParserTest.java
rename to javatests/com/android/loganalysis/parser/MonkeyLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/NativeCrashParserTest.java b/javatests/com/android/loganalysis/parser/NativeCrashParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/NativeCrashParserTest.java
rename to javatests/com/android/loganalysis/parser/NativeCrashParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/ProcessUsageParserTest.java b/javatests/com/android/loganalysis/parser/ProcessUsageParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/ProcessUsageParserTest.java
rename to javatests/com/android/loganalysis/parser/ProcessUsageParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/ProcrankParserTest.java b/javatests/com/android/loganalysis/parser/ProcrankParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/ProcrankParserTest.java
rename to javatests/com/android/loganalysis/parser/ProcrankParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/QtaguidParserTest.java b/javatests/com/android/loganalysis/parser/QtaguidParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/QtaguidParserTest.java
rename to javatests/com/android/loganalysis/parser/QtaguidParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/SmartMonkeyLogParserTest.java b/javatests/com/android/loganalysis/parser/SmartMonkeyLogParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/SmartMonkeyLogParserTest.java
rename to javatests/com/android/loganalysis/parser/SmartMonkeyLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/SystemPropsParserTest.java b/javatests/com/android/loganalysis/parser/SystemPropsParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/SystemPropsParserTest.java
rename to javatests/com/android/loganalysis/parser/SystemPropsParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/TimingsLogParserTest.java b/javatests/com/android/loganalysis/parser/TimingsLogParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/TimingsLogParserTest.java
rename to javatests/com/android/loganalysis/parser/TimingsLogParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/TopParserTest.java b/javatests/com/android/loganalysis/parser/TopParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/TopParserTest.java
rename to javatests/com/android/loganalysis/parser/TopParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/TraceFormatParserTest.java b/javatests/com/android/loganalysis/parser/TraceFormatParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/TraceFormatParserTest.java
rename to javatests/com/android/loganalysis/parser/TraceFormatParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/TracesParserTest.java b/javatests/com/android/loganalysis/parser/TracesParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/TracesParserTest.java
rename to javatests/com/android/loganalysis/parser/TracesParserTest.java
diff --git a/javatests/src/com/android/loganalysis/parser/WakelockParserTest.java b/javatests/com/android/loganalysis/parser/WakelockParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/parser/WakelockParserTest.java
rename to javatests/com/android/loganalysis/parser/WakelockParserTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/InterruptRuleTest.java b/javatests/com/android/loganalysis/rule/InterruptRuleTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/rule/InterruptRuleTest.java
rename to javatests/com/android/loganalysis/rule/InterruptRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/LocationUsageRuleTest.java b/javatests/com/android/loganalysis/rule/LocationUsageRuleTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/rule/LocationUsageRuleTest.java
rename to javatests/com/android/loganalysis/rule/LocationUsageRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/ProcessUsageRuleTest.java b/javatests/com/android/loganalysis/rule/ProcessUsageRuleTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/rule/ProcessUsageRuleTest.java
rename to javatests/com/android/loganalysis/rule/ProcessUsageRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/WakelockRuleTest.java b/javatests/com/android/loganalysis/rule/WakelockRuleTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/rule/WakelockRuleTest.java
rename to javatests/com/android/loganalysis/rule/WakelockRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/rule/WifiStatsRuleTest.java b/javatests/com/android/loganalysis/rule/WifiStatsRuleTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/rule/WifiStatsRuleTest.java
rename to javatests/com/android/loganalysis/rule/WifiStatsRuleTest.java
diff --git a/javatests/src/com/android/loganalysis/util/ArrayUtilTest.java b/javatests/com/android/loganalysis/util/ArrayUtilTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/util/ArrayUtilTest.java
rename to javatests/com/android/loganalysis/util/ArrayUtilTest.java
diff --git a/javatests/src/com/android/loganalysis/util/LogPatternUtilTest.java b/javatests/com/android/loganalysis/util/LogPatternUtilTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/util/LogPatternUtilTest.java
rename to javatests/com/android/loganalysis/util/LogPatternUtilTest.java
diff --git a/javatests/src/com/android/loganalysis/util/LogTailUtilTest.java b/javatests/com/android/loganalysis/util/LogTailUtilTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/util/LogTailUtilTest.java
rename to javatests/com/android/loganalysis/util/LogTailUtilTest.java
diff --git a/javatests/src/com/android/loganalysis/util/RegexTrieTest.java b/javatests/com/android/loganalysis/util/RegexTrieTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/util/RegexTrieTest.java
rename to javatests/com/android/loganalysis/util/RegexTrieTest.java
diff --git a/javatests/src/com/android/loganalysis/util/config/ArgsOptionParserTest.java b/javatests/com/android/loganalysis/util/config/ArgsOptionParserTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/util/config/ArgsOptionParserTest.java
rename to javatests/com/android/loganalysis/util/config/ArgsOptionParserTest.java
diff --git a/javatests/src/com/android/loganalysis/util/config/OptionSetterTest.java b/javatests/com/android/loganalysis/util/config/OptionSetterTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/util/config/OptionSetterTest.java
rename to javatests/com/android/loganalysis/util/config/OptionSetterTest.java
diff --git a/javatests/src/com/android/loganalysis/util/config/OptionUpdateRuleTest.java b/javatests/com/android/loganalysis/util/config/OptionUpdateRuleTest.java
similarity index 100%
rename from javatests/src/com/android/loganalysis/util/config/OptionUpdateRuleTest.java
rename to javatests/com/android/loganalysis/util/config/OptionUpdateRuleTest.java
