tree 20e1c1f4ea11557f2f97a9359ec020633f7591b4
parent 4c8f885b847330af8aa03bd4a7fb7a2191665470
parent 1b0d92919d7924a64732e9a08f7ea6acf3b5aec1
author Cole Faust <colefaust@google.com> 1718334488 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1718334488 +0000

Merge "Make the cflags property configurable" into main am: 1b0d92919d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131289

Change-Id: I56760a2763d6d41d82696d0286085c95d09dfa8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>