diff options
| author | Romain Jobredeaux <jobredeaux@google.com> | 2023-10-09 20:02:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-09 20:02:08 +0000 |
| commit | 9e965d6fece27a77de5377433c2f7e6999b8cc0b (patch) | |
| tree | a58049c9682d6fd38e8408479340bf3911b87515 /WORKSPACE | |
| parent | 8d58e75763b3b83025a5d9402750b2033e184474 (diff) | |
| parent | 2cec01026035db73c124100fa37115758f43e603 (diff) | |
| download | bazelbuild-rules_android-master.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 39292a3354 am: 3956589553 am: c86e585873 am: fcbd2d1e8b am: 2cec010260HEADmastermain
Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_android/+/2777173
Change-Id: Ie236d2ec96dd9c2a4450131f4094623c8d3df462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'WORKSPACE')
| -rw-r--r-- | WORKSPACE | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -19,12 +19,15 @@ maybe( android_sdk_supplemental_repository(name = "androidsdk-supplemental") load("prereqs.bzl", "rules_android_prereqs") -rules_android_prereqs() -load("defs.bzl", "rules_android_workspace") +rules_android_prereqs(dev_mode = True) + +load("defs_dev.bzl", "rules_android_workspace") rules_android_workspace() register_toolchains("//toolchains/android:all") + register_toolchains("//toolchains/android_sdk:all") + register_toolchains("//toolchains/emulator:all") |