Commit 48626b9d authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Reland "Remove unnecessary min_sdk_version from //chrome"

This reverts commit 676c68c3.

Reason for reland: Updated mismatched manifest.

Original change's description:
> Revert "Remove unnecessary min_sdk_version from //chrome"
>
> This reverts commit 3166ebf7.
>
> Reason for revert: Causing compile failure
> https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8871331944681332016/+/steps/compile/0/stdout
>
> Original change's description:
> > Remove unnecessary min_sdk_version from //chrome
> >
> > Having these causes apks to disable dex merging, making builds a bit
> > slower.
> >
> > Bug: None
> > Change-Id: I33903834529b5c2e1fec43cb81c3d076ca899055
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367648
> > Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#800658}
>
> TBR=agrieve@chromium.org,pkotwicz@chromium.org
>
> Change-Id: Iaa31715b3e3421a10a87ce0d7699ecd8f5d5dc71
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: None
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368316
> Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
> Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#800665}

Bug: None
Change-Id: I230521db24b5942374392747dc8ae872067153e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2369436
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Kotwicz <pkotwicz@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801206}
parent bfcf8b3c
...@@ -11,10 +11,6 @@ android_apk("apk_with_webapk_service") { ...@@ -11,10 +11,6 @@ android_apk("apk_with_webapk_service") {
# Used as an additional_apk in test scripts. # Used as an additional_apk in test scripts.
never_incremental = true never_incremental = true
# Multidex requires a custom Application class to initialize it. Simpler to
# just disable it.
enable_multidex = false
android_manifest = "AndroidManifest.xml" android_manifest = "AndroidManifest.xml"
apk_name = "ApkWithWebApkService" apk_name = "ApkWithWebApkService"
sources = [ "src/org/chromium/webapk/lib/runtime_library/test/TestWebApkServiceImplWrapper.java" ] sources = [ "src/org/chromium/webapk/lib/runtime_library/test/TestWebApkServiceImplWrapper.java" ]
...@@ -22,5 +18,4 @@ android_apk("apk_with_webapk_service") { ...@@ -22,5 +18,4 @@ android_apk("apk_with_webapk_service") {
"//chrome/android/webapk/libs/runtime_library:runtime_library_for_tests_java", "//chrome/android/webapk/libs/runtime_library:runtime_library_for_tests_java",
"//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
] ]
min_sdk_version = 16
} }
...@@ -19,7 +19,6 @@ android_apk("dex_optimizer_apk") { ...@@ -19,7 +19,6 @@ android_apk("dex_optimizer_apk") {
enable_multidex = false enable_multidex = false
android_manifest = "AndroidManifest.xml" android_manifest = "AndroidManifest.xml"
min_sdk_version = 16
apk_name = "DexOptimizer" apk_name = "DexOptimizer"
chromium_code = false chromium_code = false
sources = [ "src/org/chromium/webapk/shell_apk/test/dex_optimizer/DexOptimizerServiceImpl.java" ] sources = [ "src/org/chromium/webapk/shell_apk/test/dex_optimizer/DexOptimizerServiceImpl.java" ]
......
...@@ -64,7 +64,6 @@ android_apk("custom_tabs_client_example_apk") { ...@@ -64,7 +64,6 @@ android_apk("custom_tabs_client_example_apk") {
] ]
android_manifest = "src/AndroidManifest.xml" android_manifest = "src/AndroidManifest.xml"
min_sdk_version = 19
target_sdk_version = 21 target_sdk_version = 21
apk_name = "CustomTabsClientExample" apk_name = "CustomTabsClientExample"
......
...@@ -18,10 +18,6 @@ ...@@ -18,10 +18,6 @@
android:versionCode="1" android:versionCode="1"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="19"
android:targetSdkVersion="21" />
<application <application
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment