From 29254e1e2310b9114c68d0b0e25a2989f7d4c0ae Mon Sep 17 00:00:00 2001 From: Teo Georgescu Date: Thu, 12 Jan 2023 09:43:12 +0000 Subject: [PATCH] Revert "vib example client on product" This reverts commit f2ff92f3e0e45807fab062edfaf4e96198d2e9f4. Reason for revert: DroidMonitor: Potential culprit for Bug b/265255626 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Change-Id: I30f87a33803d00c03f9472a77ba73479c06044b0 --- .../Android.bp | 18 +----------------- .../AndroidManifest.xml | 0 .../example/vib/MyActivity.java | 0 .../getter.cpp | 0 .../jarjar.txt | 0 5 files changed, 1 insertion(+), 17 deletions(-) rename vibrator/aidl/default/{example_java_client => example_vendor_java_client}/Android.bp (65%) rename vibrator/aidl/default/{example_java_client => example_vendor_java_client}/AndroidManifest.xml (100%) rename vibrator/aidl/default/{example_java_client => example_vendor_java_client}/example/vib/MyActivity.java (100%) rename vibrator/aidl/default/{example_java_client => example_vendor_java_client}/getter.cpp (100%) rename vibrator/aidl/default/{example_java_client => example_vendor_java_client}/jarjar.txt (100%) diff --git a/vibrator/aidl/default/example_java_client/Android.bp b/vibrator/aidl/default/example_vendor_java_client/Android.bp similarity index 65% rename from vibrator/aidl/default/example_java_client/Android.bp rename to vibrator/aidl/default/example_vendor_java_client/Android.bp index a0baabc5d1..f615cb1579 100644 --- a/vibrator/aidl/default/example_java_client/Android.bp +++ b/vibrator/aidl/default/example_vendor_java_client/Android.bp @@ -10,8 +10,7 @@ package { cc_library { name: "libexample_vib_getter", srcs: ["getter.cpp"], - product_available: true, - vendor_available: true, + vendor: true, shared_libs: [ "liblog", "libbinder_ndk", @@ -27,21 +26,6 @@ android_app { vendor: true, static_libs: ["android.hardware.vibrator-V1-java"], jni_libs: ["libexample_vib_getter"], - use_embedded_native_libs: true, - jarjar_rules: "jarjar.txt", - stl: "c++_shared", - srcs: ["example/vib/MyActivity.java"], - sdk_version: "system_current", - visibility: [":__subpackages__"], -} - -android_app { - name: "ExampleVibratorJavaProductClient", - privileged: true, - product_specific: true, - static_libs: ["android.hardware.vibrator-V1-java"], - jni_libs: ["libexample_vib_getter"], - use_embedded_native_libs: true, jarjar_rules: "jarjar.txt", stl: "c++_shared", srcs: ["example/vib/MyActivity.java"], diff --git a/vibrator/aidl/default/example_java_client/AndroidManifest.xml b/vibrator/aidl/default/example_vendor_java_client/AndroidManifest.xml similarity index 100% rename from vibrator/aidl/default/example_java_client/AndroidManifest.xml rename to vibrator/aidl/default/example_vendor_java_client/AndroidManifest.xml diff --git a/vibrator/aidl/default/example_java_client/example/vib/MyActivity.java b/vibrator/aidl/default/example_vendor_java_client/example/vib/MyActivity.java similarity index 100% rename from vibrator/aidl/default/example_java_client/example/vib/MyActivity.java rename to vibrator/aidl/default/example_vendor_java_client/example/vib/MyActivity.java diff --git a/vibrator/aidl/default/example_java_client/getter.cpp b/vibrator/aidl/default/example_vendor_java_client/getter.cpp similarity index 100% rename from vibrator/aidl/default/example_java_client/getter.cpp rename to vibrator/aidl/default/example_vendor_java_client/getter.cpp diff --git a/vibrator/aidl/default/example_java_client/jarjar.txt b/vibrator/aidl/default/example_vendor_java_client/jarjar.txt similarity index 100% rename from vibrator/aidl/default/example_java_client/jarjar.txt rename to vibrator/aidl/default/example_vendor_java_client/jarjar.txt