Snap for 11224086 from 349f8fc61dfcde3c2955a988cb809e9f8e863cb6 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: I2b5e078714e725e438f10afc93029115c2d9bc40

7 files changed, 28 insertions, 8 deletions

diff --git a/aosp_trout_arm64.mk b/aosp_trout_arm64.mk
index 87b7f8b..082d32e 100644
--- a/aosp_trout_arm64.mk
+++ b/aosp_trout_arm64.mk
@@ -66,6 +66,8 @@ LOCAL_SENSOR_PRODUCT_PACKAGE ?= \
 
 LOCAL_SENSOR_FILE_OVERRIDES := true
 
+LOCAL_ENABLE_OEMLOCK ?= false
+
 UEVENTD_ODM_COPY_FILE ?= device/google/trout/product_files/odm/ueventd.rc
 
 PRODUCT_COPY_FILES += \
diff --git a/aosp_trout_common.mk b/aosp_trout_common.mk
index d8a9a17..15b3d87 100644
--- a/aosp_trout_common.mk
+++ b/aosp_trout_common.mk
@@ -21,6 +21,9 @@ PRODUCT_PACKAGE_OVERLAYS += device/google/trout/product_files/overlay
 
 LOCAL_DEVICE_FCM_MANIFEST_FILE ?= device/google/trout/manifest.xml
 
+# Disable shared system image checking
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := false
+
 ifeq ($(TARGET_USES_CUTTLEFISH_AUDIO),false)
 # Car Emulator Audio HAL
 LOCAL_AUDIO_PRODUCT_PACKAGE ?= \
diff --git a/hal/audiocontrol/aidl/1.0/Android.bp b/hal/audiocontrol/aidl/1.0/Android.bp
index 093a8eb..7746c3f 100644
--- a/hal/audiocontrol/aidl/1.0/Android.bp
+++ b/hal/audiocontrol/aidl/1.0/Android.bp
@@ -36,9 +36,10 @@ genrule {
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -I$$(dirname $(in)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+    cmd: "$(location aprotoc) -I$$(dirname $(location proto/AudioFocusControl.proto)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/AudioFocusControl.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "proto/AudioFocusControl.proto",
+        ":libprotobuf-internal-protos",
     ],
     out: [
         "AudioFocusControl.pb.h",
@@ -52,9 +53,10 @@ genrule {
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -I$$(dirname $(in)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+    cmd: "$(location aprotoc) -I$$(dirname $(location proto/AudioFocusControl.proto)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/AudioFocusControl.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "proto/AudioFocusControl.proto",
+        ":libprotobuf-internal-protos",
     ],
     out: [
         "AudioFocusControl.pb.cc",
diff --git a/hal/dumpstate/aidl/1.0/Android.bp b/hal/dumpstate/aidl/1.0/Android.bp
index 5b80ae0..d00f97a 100644
--- a/hal/dumpstate/aidl/1.0/Android.bp
+++ b/hal/dumpstate/aidl/1.0/Android.bp
@@ -24,9 +24,10 @@ genrule {
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -I$$(dirname $(in)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+    cmd: "$(location aprotoc) -Idevice/google/trout/hal/dumpstate/aidl/1.0/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/DumpstateServer.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "proto/DumpstateServer.proto",
+        ":libprotobuf-internal-protos",
     ],
     out: [
         "DumpstateServer.pb.h",
@@ -40,9 +41,10 @@ genrule {
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -I$$(dirname $(in)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+    cmd: "$(location aprotoc) -Idevice/google/trout/hal/dumpstate/aidl/1.0/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/DumpstateServer.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "proto/DumpstateServer.proto",
+        ":libprotobuf-internal-protos",
     ],
     out: [
         "DumpstateServer.pb.cc",
diff --git a/hal/vehicle/2.0/Android.bp b/hal/vehicle/2.0/Android.bp
index ba39666..d593231 100644
--- a/hal/vehicle/2.0/Android.bp
+++ b/hal/vehicle/2.0/Android.bp
@@ -65,9 +65,11 @@ genrule {
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -I$$(dirname $(in)) -Ihardware/interfaces/automotive/vehicle/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+    cmd: "$(location aprotoc) -I$$(dirname $(location proto/VehicleServer.proto)) -Ihardware/interfaces/automotive/vehicle/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/VehicleServer.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "proto/VehicleServer.proto",
+        ":vhal-proto-src",
+        ":libprotobuf-internal-protos",
     ],
     out: [
         "VehicleServer.pb.h",
@@ -81,9 +83,11 @@ genrule {
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -I$$(dirname $(in)) -Ihardware/interfaces/automotive/vehicle/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+    cmd: "$(location aprotoc) -I$$(dirname $(location proto/VehicleServer.proto)) -Ihardware/interfaces/automotive/vehicle/proto -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location proto/VehicleServer.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "proto/VehicleServer.proto",
+        ":vhal-proto-src",
+        ":libprotobuf-internal-protos",
     ],
     out: [
         "VehicleServer.pb.cc",
diff --git a/tools/tracing/proto/Android.bp b/tools/tracing/proto/Android.bp
index 1ac8d77..7093ddd 100644
--- a/tools/tracing/proto/Android.bp
+++ b/tools/tracing/proto/Android.bp
@@ -24,9 +24,10 @@ genrule {
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -I$$(dirname $(in)) --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+    cmd: "$(location aprotoc) -I$$(dirname $(location TracingVM.proto)) --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location TracingVM.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "TracingVM.proto",
+        "perfetto_trace.proto",
     ],
     out: [
         "TracingVM.pb.h",
@@ -40,9 +41,10 @@ genrule {
         "aprotoc",
         "protoc-gen-grpc-cpp-plugin",
     ],
-    cmd: "$(location aprotoc) -I$$(dirname $(in)) --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
+    cmd: "$(location aprotoc) -I$$(dirname $(location TracingVM.proto)) --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(location TracingVM.proto) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "TracingVM.proto",
+        "perfetto_trace.proto",
     ],
     out: [
         "TracingVM.pb.cc",
diff --git a/trout_x86_64/BoardConfig.mk b/trout_x86_64/BoardConfig.mk
index 5882fa0..c2b269b 100644
--- a/trout_x86_64/BoardConfig.mk
+++ b/trout_x86_64/BoardConfig.mk
@@ -37,5 +37,10 @@ TARGET_NATIVE_BRIDGE_2ND_ARCH_VARIANT := armv7-a-neon
 TARGET_NATIVE_BRIDGE_2ND_CPU_VARIANT := generic
 TARGET_NATIVE_BRIDGE_2ND_ABI := armeabi-v7a armeabi
 
+# VHAL Fake Server Address
+# VMADDR_CID_LOCAL (1) for the fake server in the same VM.
+BOARD_KERNEL_CMDLINE += androidboot.vendor.vehiclehal.server.cid=1
+BOARD_KERNEL_CMDLINE += androidboot.vendor.vehiclehal.server.port=9210
+
 -include device/google/trout/shared/BoardConfig.mk
 -include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk