Snap for 11435509 from 0be2028ebfb55711770fa1808b26db4f7a63c26b to emu-34-2-release

Change-Id: Ibd49a678bedaa6b3dbf4d3bf5cec26cbdb6bc7dc

3 files changed, 6 insertions, 6 deletions

diff --git a/base/Android.bp b/base/Android.bp
index d01d66c..e767958 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -1,5 +1,4 @@
 package {
-    default_team: "trendy_team_automotive",
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // all of the 'license_kinds' from "hardware_google_aemu_license"
@@ -46,7 +45,7 @@ cc_library_static {
 // Run with `atest --host gfxstream_base_tests`
 cc_test_host {
     name: "gfxstream_base_tests",
-    defaults: ["gfxstream_defaults"],
+    defaults: [ "gfxstream_defaults" ],
     srcs: [
         "LruCache_unittest.cpp",
     ],
@@ -63,7 +62,7 @@ cc_test_host {
 
 cc_test_library {
     name: "gfxstream_base_test_support",
-    defaults: ["gfxstream_defaults"],
+    defaults: [ "gfxstream_defaults" ],
     srcs: [
         "testing/file_io.cpp",
     ],
diff --git a/host-common/include/host-common/FeatureControl.h b/host-common/include/host-common/FeatureControl.h
index 57e0621..0b4593c 100644
--- a/host-common/include/host-common/FeatureControl.h
+++ b/host-common/include/host-common/FeatureControl.h
@@ -28,7 +28,9 @@ namespace featurecontrol {
 
 // featurecontrol is used to switch on/off advanced features It loads
 // sdk/emulator/lib/advancedFeatures.ini for default values and
-// .android/advancedFeatures.ini for user overridden values.
+// .android/advancedFeatures.ini for user overriden values.  If on canary
+// update channel, sdk/emulator/lib/advancedFeaturesCanary.ini is used for
+// default values.
 // It is expected to be initialized at the beginning of the emulator.
 // For easier testing, one may also want to pass the override value through
 // command line and call setEnabledOverride. (Command line override not
@@ -37,7 +39,7 @@ namespace featurecontrol {
 // featurecontrol::isEnabled is thread safe, all other methods are not.
 //
 // To add new features, please (1) add it to android/data/advancedFeatures.ini
-// and (2) add a new line to
+// or android/data/advancedFeaturesCanary.ini and (2) add a new line to
 // FeatureControlDef.h, in the following format:
 // FEATURE_CONTROL_ITEM(YOUR_FEATURE_NAME)
 
diff --git a/host-common/include/host-common/FeatureControlDefHost.h b/host-common/include/host-common/FeatureControlDefHost.h
index b153054..2f26f19 100644
--- a/host-common/include/host-common/FeatureControlDefHost.h
+++ b/host-common/include/host-common/FeatureControlDefHost.h
@@ -80,4 +80,3 @@ FEATURE_CONTROL_ITEM(SystemBlob, 46)
 FEATURE_CONTROL_ITEM(NetsimWebUi, 93)
 FEATURE_CONTROL_ITEM(NetsimCliUi, 94)
 FEATURE_CONTROL_ITEM(WiFiPacketStream, 95)
-FEATURE_CONTROL_ITEM(VulkanAllocateDeviceMemoryOnly, 98)