commit 6a3d438aa0fcba31211ee040836347fc4130c1b0
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 22 11:46:13 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 22 11:46:13 2019 +0000
tree dc44e2f5bb0a422a394746e80609ed0e0ed278bd
parent 967105ada9592416210453149cea964f4ca81e58
parent 3c6fde2d90fffa5727d7b1d18f1fd9c99bc6a7cd

Merge "Disable non-AOSP nnapi extensions on product partition in GSI"

target/board/gsi_system.prop

diff --git a/target/board/gsi_system.prop b/target/board/gsi_system.prop
index d768c83..780aadc 100644
--- a/target/board/gsi_system.prop
+++ b/target/board/gsi_system.prop
@@ -4,6 +4,9 @@
 # GSI always disables adb authentication
 ro.adb.secure=0
 
+# GSI disables non-AOSP nnapi extensions on product partition
+ro.nnapi.extensions.deny_on_product=true
+
 # TODO(b/120679683): disable RescueParty before all problem apps solved
 persist.sys.disable_rescue=true
 

target/board/gsi_system_user.prop

diff --git a/target/board/gsi_system_user.prop b/target/board/gsi_system_user.prop
index becb783..217bd01 100644
--- a/target/board/gsi_system_user.prop
+++ b/target/board/gsi_system_user.prop
@@ -1,6 +1,9 @@
 # GSI always generate dex pre-opt in system image
 ro.cp_system_other_odex=0
 
+# GSI disables non-AOSP nnapi extensions on product partition
+ro.nnapi.extensions.deny_on_product=true
+
 # TODO(b/120679683): disable RescueParty before all problem apps solved
 persist.sys.disable_rescue=true