Make update_engine_stable_client product_specific. am: 309c8a883e am: 6e641d743b am: abf732f0f4 am: e317cdc79a
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1443150
Change-Id: Ie8f66d3e0170654b5b36c014f81675c14d9f972e
diff --git a/Android.bp b/Android.bp
index 008a432..9187e67 100644
--- a/Android.bp
+++ b/Android.bp
@@ -753,6 +753,13 @@
// update_engine header library
cc_library_headers {
name: "libupdate_engine_headers",
+
+ // This header library is available to core and product modules.
+ // Right now, vendor_available is the only way to specify this.
+ // vendor modules should NOT use this library.
+ // TODO(b/150902910): change this to product_available.
+ vendor_available: true,
+
export_include_dirs: ["."],
apex_available: [
"com.android.gki.*",
diff --git a/stable/Android.bp b/stable/Android.bp
index 337ae96..a415ac5 100644
--- a/stable/Android.bp
+++ b/stable/Android.bp
@@ -18,6 +18,13 @@
// ========================================================
aidl_interface {
name: "libupdate_engine_stable",
+
+ // This header library is available to core and product modules.
+ // Right now, vendor_available is the only way to specify this.
+ // vendor modules should NOT use this library.
+ // TODO(b/150902910): change this to product_available.
+ vendor_available: true,
+
srcs: [
"android/os/IUpdateEngineStable.aidl",
"android/os/IUpdateEngineStableCallback.aidl",
@@ -40,10 +47,10 @@
// update_engine_stable_client (type: executable)
// ========================================================
-// update_engine console client installed to APEXes
+// update_engine console client installed to APEXes.
cc_binary {
name: "update_engine_stable_client",
-
+ product_specific: true,
header_libs: [
"libupdate_engine_headers",
],
diff --git a/stable/update_engine_stable_client.cc b/stable/update_engine_stable_client.cc
index da203c4..17f66b6 100644
--- a/stable/update_engine_stable_client.cc
+++ b/stable/update_engine_stable_client.cc
@@ -32,7 +32,6 @@
#include <android/binder_ibinder.h>
#include <common/error_code.h>
#include <gflags/gflags.h>
-#include <utils/StrongPointer.h>
namespace chromeos_update_engine::internal {