diff options
| author | 2025-01-12 21:35:27 -0800 | |
|---|---|---|
| committer | 2025-01-12 21:35:27 -0800 | |
| commit | c86b36810f7de5fc6967ffbf73789f1c54d736da (patch) | |
| tree | b4f8078effe244c4c3412d2e2ecf0edcc6394b6d /scripts/merge_json.py | |
| parent | f01a7e92d8fa7d1be502d1504606aaa0fc1fbbb2 (diff) | |
| parent | a8c8e20d0da3c6231906c225099f38d983ade041 (diff) | |
Merge changes from topic "non-aosp-allowed-deps" into main
* changes:
Collect dependencies of updatable apexes only for AOSP APEX
Revert "Added EXTRA_ALLOWED_DEPS_TXT to allow arbitrary allowedlist text files that enforces min_sdk_version for apex dependencies to avoid regression"
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions