commit c710cf28ff87c7427c3b1f01617ed684ef096793
author Kelvin Zhang <zhangkelvin@google.com> Sat Dec 05 21:18:58 2020 +0000
committer Kelvin Zhang <zhangkelvin@google.com> Sat Dec 05 21:18:58 2020 +0000
tree c863a7052f9d4ad0c8b45cc359c98f23b35556fa
parent 6d121de1d4c09d5ef56cac6fce54c15d69148f4a
parent 4aeaa124fafcf18b8664b2baf815e17c27c834a8

Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

Android.bp

diff --git a/Android.bp b/Android.bp
index 5ae7a73..e192a63 100644
--- a/Android.bp
+++ b/Android.bp
@@ -795,10 +795,7 @@
     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,
+    product_available: true,
 
     export_include_dirs: ["."],
     apex_available: [

stable/Android.bp

diff --git a/stable/Android.bp b/stable/Android.bp
index a415ac5..2b6a318 100644
--- a/stable/Android.bp
+++ b/stable/Android.bp
@@ -20,10 +20,7 @@
     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,
+    product_available: true,
 
     srcs: [
         "android/os/IUpdateEngineStable.aidl",