Merge "Move fuelgauge_usage_state.proto into fuelgauge folder."
diff --git a/protos/Android.bp b/protos/Android.bp
index 26b1ec8..d546e2d 100644
--- a/protos/Android.bp
+++ b/protos/Android.bp
@@ -41,11 +41,3 @@
},
srcs: ["fuelgauge_log.proto"],
}
-
-java_library {
- name: "fuelgauge-usage-state-protos-lite",
- proto: {
- type: "lite",
- },
- srcs: ["fuelgauge_usage_state.proto"],
-}
diff --git a/src/com/android/settings/fuelgauge/protos/Android.bp b/src/com/android/settings/fuelgauge/protos/Android.bp
new file mode 100644
index 0000000..ab5e36b
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/protos/Android.bp
@@ -0,0 +1,16 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "packages_apps_Settings_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
+java_library {
+ name: "fuelgauge-usage-state-protos-lite",
+ proto: {
+ type: "lite",
+ },
+ srcs: ["fuelgauge_usage_state.proto"],
+}
\ No newline at end of file
diff --git a/protos/fuelgauge_usage_state.proto b/src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto
similarity index 96%
rename from protos/fuelgauge_usage_state.proto
rename to src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto
index cd112ea..813344b 100644
--- a/protos/fuelgauge_usage_state.proto
+++ b/src/com/android/settings/fuelgauge/protos/fuelgauge_usage_state.proto
@@ -1,6 +1,5 @@
syntax = "proto2";
-package com.android.settings.intelligence;
option java_multiple_files = true;
option java_package = "com.android.settings.fuelgauge.batteryusage";
option java_outer_classname = "FuelgaugeUsageStateProto";