DO NOT MERGE resolve merge conflicts of 0c82fe16a1f5f956cc4906e55230fa8921644a52 to sc-dev

Change-Id: Ia4cbb3e2b746c9c19a3084085c4f2c4fbc8297ca

8 files changed, 32 insertions, 0 deletions

diff --git a/vibrator/Android.bp b/vibrator/Android.bp
index 36b43b56..2d6d4d4e 100644
--- a/vibrator/Android.bp
+++ b/vibrator/Android.bp
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_defaults {
     name: "PixelVibratorDefaults",
     relative_install_path: "hw",
diff --git a/vibrator/common/Android.bp b/vibrator/common/Android.bp
index d40e7a91..04fbc4d7 100644
--- a/vibrator/common/Android.bp
+++ b/vibrator/common/Android.bp
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_library {
     name: "PixelVibratorCommon",
     srcs: [
diff --git a/vibrator/cs40l25/Android.bp b/vibrator/cs40l25/Android.bp
index f0aab554..b321f4d0 100644
--- a/vibrator/cs40l25/Android.bp
+++ b/vibrator/cs40l25/Android.bp
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_defaults {
     name: "android.hardware.vibrator-defaults.cs40l25",
     cflags: [
diff --git a/vibrator/cs40l25/bench/Android.bp b/vibrator/cs40l25/bench/Android.bp
index 87a9dc0c..110fea88 100644
--- a/vibrator/cs40l25/bench/Android.bp
+++ b/vibrator/cs40l25/bench/Android.bp
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_benchmark {
     name: "VibratorHalCs40l25Benchmark",
     defaults: ["VibratorHalCs40l25TestDefaults"],
diff --git a/vibrator/cs40l25/tests/Android.bp b/vibrator/cs40l25/tests/Android.bp
index 7acdece0..438df067 100644
--- a/vibrator/cs40l25/tests/Android.bp
+++ b/vibrator/cs40l25/tests/Android.bp
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_test {
     name: "VibratorHalCs40l25TestSuite",
     defaults: ["VibratorHalCs40l25TestDefaults"],
diff --git a/vibrator/drv2624/Android.bp b/vibrator/drv2624/Android.bp
index 594aaeb2..ef792a39 100644
--- a/vibrator/drv2624/Android.bp
+++ b/vibrator/drv2624/Android.bp
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_defaults {
     name: "android.hardware.vibrator-defaults.drv2624",
     cflags: [
diff --git a/vibrator/drv2624/bench/Android.bp b/vibrator/drv2624/bench/Android.bp
index 6227dc5a..e2d68daa 100644
--- a/vibrator/drv2624/bench/Android.bp
+++ b/vibrator/drv2624/bench/Android.bp
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_benchmark {
     name: "VibratorHalDrv2624Benchmark",
     defaults: ["VibratorHalDrv2624TestDefaults"],
diff --git a/vibrator/drv2624/tests/Android.bp b/vibrator/drv2624/tests/Android.bp
index 4c857402..8f392a10 100644
--- a/vibrator/drv2624/tests/Android.bp
+++ b/vibrator/drv2624/tests/Android.bp
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 cc_test {
     name: "VibratorHalDrv2624TestSuite",
     defaults: ["VibratorHalDrv2624TestDefaults"],