Skip to content

Commit bc6e00f

Browse files
committed
some updates
1 parent c96df60 commit bc6e00f

6 files changed

Lines changed: 19 additions & 10 deletions

File tree

examples/basicapp/.bazelrc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,16 @@ build:windows --define=protobuf_allow_msvc=true
3535

3636
common --enable_platform_specific_config
3737

38+
common \
39+
--incremental_dexing=true \
40+
--define=android_dexmerger_tool=d8_dexmerger \
41+
--define=android_incremental_dexing_tool=d8_dexbuilder \
42+
--define=android_standalone_dexing_tool=d8_compat_dx \
43+
--experimental_use_dex_splitter_for_incremental_dexing=true \
44+
--experimental_incremental_dexing_after_proguard_by_default=true \
45+
--experimental_incremental_dexing_after_proguard=50 \
46+
--java_language_version=11 --tool_java_language_version=11 \
47+
--java_runtime_version=21 --tool_java_runtime_version=21 \
48+
--desugar_java8_libs --experimental_check_desugar_deps=false \
49+
--@rules_android//rules/flags:manifest_merge_order=legacy
50+

examples/basicapp/MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ remote_android_extensions = use_extension(
2626
use_repo(remote_android_extensions, "android_tools")
2727

2828
android_sdk_repository_extension = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")
29+
android_sdk_repository_extension.configure(api_level = 32)
2930
use_repo(android_sdk_repository_extension, "androidsdk")
3031

3132
register_toolchains("@androidsdk//:sdk-toolchain", "@androidsdk//:all")

examples/basicapp/java/com/basicapp/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package="com.basicapp" >
44

55
<uses-sdk
6-
android:minSdkVersion="21"
6+
android:minSdkVersion="28"
77
android:targetSdkVersion="30" />
88

99
<application

examples/basicapp/java/com/basicapp/BUILD

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,11 @@ load(
66
)
77
load("@rules_java//java:java_library.bzl", "java_library")
88

9-
genrule(
10-
name = "proguard_cfg",
11-
outs = ["proguard.cfg"],
12-
cmd = "echo > $@",
13-
)
14-
159
android_binary(
1610
name = "basic_app",
1711
manifest = "AndroidManifest.xml",
1812
deps = [":basic_lib"],
19-
proguard_specs = [":proguard_cfg"],
13+
proguard_specs = ["proguard.cfg"],
2014
)
2115

2216
android_library(
@@ -30,7 +24,6 @@ android_library(
3024
java_library(
3125
name = "basic_dep",
3226
srcs = ["BasicDep.java"],
33-
# manifest = "AndroidManifest.xml",
3427
)
3528

3629
android_application(
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-dontobfuscate
2+
-keepattributes SourceFile,LineNumberTable

rules/min_sdk_version.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
2424
visibility(PROJECT_VISIBILITY)
2525

2626
_SETTING = "//rules/flags:min_sdk_version"
27-
_DEPOT_FLOOR = 23
27+
_DEPOT_FLOOR = 28
2828
_MIN_SDK_LEVELS = sorted([_DEPOT_FLOOR, 24])
2929

3030
_ATTRS = dict(

0 commit comments

Comments
 (0)