commit 4ec902672cfd182bebfca93e381e87167adc3e6c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 16 18:08:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 16 18:08:02 2024 +0000
tree 0187bca3fbcd089cbce756528c6b7235066637a3
parent 666fa26c132f253f9aad33ac81c0f6dfff88a784

Update git submodules

* Update frameworks/base from branch 'main'
  to 9cdfcfb29f0b57f8eeb0ea7af127c4975affb9a7
  - Merge "Support properties in path when merging overlay configs" into main
  - Support properties in path when merging overlay configs
    
    Make it possible to use read only properties in the path when merging
    an overlay config.
    
    One of the usecases is to support switching overlays depending on SKU.
    
    Example:
    <config>
      <overlay package="..." enabled="true" mutable="false" />
      <merge path="${ro.my.prop}/config.xml" />
      <merge path="skus/${ro.my.prop}.xml" />
      <overlay package="..." enabled="true" mutable="false" />
    </config>
    
    Bug: 223913150
    Test: atest OverlayConfigTest OverlayConfigParserTest
    Change-Id: Ic9e460e5064a9601e713b3959a66a80bdf78734a