diff options
author | jbudorick <jbudorick@chromium.org> | 2016-01-15 14:21:14 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-15 22:22:31 +0000 |
commit | 1c4276c2ef480164f6cef4d79e98ffcebadea44d (patch) | |
tree | e43a39de74fb9c479c5aff06e499605c43a73ff9 /chrome/chrome_tests_unit.gypi | |
parent | d446934dfd458b7492414ace4c75947eb60d079e (diff) | |
download | chromium_src-1c4276c2ef480164f6cef4d79e98ffcebadea44d.zip chromium_src-1c4276c2ef480164f6cef4d79e98ffcebadea44d.tar.gz chromium_src-1c4276c2ef480164f6cef4d79e98ffcebadea44d.tar.bz2 |
Revert of [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND) (patchset #2 id:20001 of https://codereview.chromium.org/1590243003/ )
Reason for revert:
mysterious compile errors on Android appeared two builds after this landed.
https://build.chromium.org/p/chromium/builders/Android/builds/50690
Original issue's description:
> [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND)
>
> This is a reland of https://codereview.chromium.org/1581563003
>
> BUG=272790
> TBR=thakis@chromium.org,yfriedman@chromium.org,phajdan.jr@chromium.org
>
> Committed: https://crrev.com/ab450c5ede0635194331286088d0f488f4086ba5
> Cr-Commit-Position: refs/heads/master@{#369815}
TBR=agrieve@chromium.org,thakis@chromium.org,yfriedman@chromium.org,phajdan.jr@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=272790
Review URL: https://codereview.chromium.org/1587673014
Cr-Commit-Position: refs/heads/master@{#369864}
Diffstat (limited to 'chrome/chrome_tests_unit.gypi')
-rw-r--r-- | chrome/chrome_tests_unit.gypi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index a476f9a..2a8b57c 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2983,7 +2983,6 @@ 'test_suite_name': 'unit_tests', 'isolate_file': 'unit_tests.isolate', 'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifest.xml', - 'enable_multidex': 1, 'conditions': [ ['v8_use_external_startup_data==1', { 'asset_location': '<(PRODUCT_DIR)/unit_tests_apk/assets', |