commit 785df30de6db3703925023aa67986e0d04a35764
author Steven Moreland <smoreland@google.com> Wed Jun 20 13:15:05 2018 -0700
committer Greg Hartman <ghartman@google.com> Tue Jun 26 21:30:22 2018 -0700
tree 62bca948f76813085a6fd9ba7afa6e567ed4c8a9
parent a072b7050a36baaa3d4d7ca51a44264ba7af6522

Use RRO for framework-res.

These configurations were missing from the GSI,
resulting in a missing navigation bar.

Test: boot w/ w/o GSI, both have navbar
Bug: 110064661
Change-Id: Icf8980b3b905ee8bcac7d2de7d4e2c71fde5adda

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 46e6e6f..e97cb48 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -16,6 +16,10 @@
 
 PRODUCT_COPY_FILES += device/google/cuttlefish_kernel/4.4-x86_64/kernel:kernel
 
+PRODUCT_SHIPPING_API_LEVEL := 26
+
+PRODUCT_ENFORCE_RRO_TARGETS := framework-res
+
 # Explanation of specific properties:
 #   debug.hwui.swap_with_damage avoids boot failure on M http://b/25152138
 #   ro.opengles.version OpenGLES 2.0
@@ -91,6 +95,8 @@
     libGLESv2_swiftshader \
 
 DEVICE_PACKAGE_OVERLAYS := device/google/cuttlefish/shared/overlay
+PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := device/google/cuttlefish/shared/overlay
+
 PRODUCT_AAPT_CONFIG := normal large xlarge hdpi xhdpi
 # PRODUCT_AAPT_PREF_CONFIG is intentionally not set to pick up every density resources.