aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-15Add android.test.base/stubs dependencyandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devPaul Duffin
In preparation for the removal of the non-junit classes in the android.test.base library from the android.jar this adds a dependency on android.test.base/stubs to ensure this code will continue to compile. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because Browser2's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. Bug: 30188076 Test: make dist Change-Id: I15823654c5cef130b759d82b80f325463f84e10c
2017-12-05Flatten dependency hierarchy of legacy-android-testPaul Duffin
Previous changes statically included legacy-android-test in preparation for removing android.test.* and junit.* classes from the android.jar. Unfortunately, that lead to duplicate classes between APKs and the bootclasspath which caused build problems (Proguard) and also runtime problems (when targeting and running on older releases). Switching from statically including the classes to using the runtime libraries cannot be done in one step because legacy-android-test is statically included in libraries which are used in many APKs and so removing it from those libraries requires that all APKs be updated at once. Doing that atomically across dozens of projects is not practical. This change modifies APKS that statically include the legacy-android-test library indirectly. * If the APK manifest uses the android.test.runner library then the APK is modified to stop statically including legacy-android-test and instead build against android.test.base/mock/runner libraries instead. * Otherwise, the APK statically includes legacy-android-test. Also, any libraries that statically include are modified to stop statically including it and if it has source dependencies on the classes is changed to build against the android.test.base/mock/runner libraries. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * Android.mk Replaced 'legacy-android-test' with 'android.test.runner.stubs' in LOCAL_JAVA_LIBRARIES because Browser2's source depends on its classes. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that Browser2 specifies in its manifest. Bug: 30188076 Test: make checkbuild Change-Id: I923c3bd4433b6392628cd297f2d6a6dd88b1818c
2017-06-14Fix dependencies of packages that target earlier releases am: ffc5f72f39 am: ↵android-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7oreo-mr1-devo-mr1-iot-preview-8o-mr1-iot-preview-7Paul Duffin
1980ffb6a1 am: 9180bc72bc am: ce9866578e Change-Id: Ia4acb03cec2baf0c79815194b747047327f4c8ba
2017-06-14Fix dependencies of packages that target earlier releases am: ffc5f72f39 am: ↵android-o-mr1-iot-preview-6o-mr1-iot-preview-6Paul Duffin
1980ffb6a1 am: 9180bc72bc Change-Id: Id23a13594265b73d3cfd19e7cc5fe4a3e9ae19dd
2017-06-14Fix dependencies of packages that target earlier releases am: ffc5f72f39android-o-mr1-preview-2android-o-mr1-preview-1Paul Duffin
am: 1980ffb6a1 Change-Id: I7a0fa1d68711077d46198eb94d0b79602e43d911
2017-06-14Fix dependencies of packages that target earlier releasesPaul Duffin
am: ffc5f72f39 Change-Id: Ibe073c0b408c8ddf5117a23b388d5b6ee151165d
2017-06-13Fix dependencies of packages that target earlier releasesandroid-o-preview-4android-o-iot-preview-5o-iot-preview-5Paul Duffin
A previous change added legacy-android-test as a static dependency to all packages that build against the current, test_current or system_current and failed to compile when the junit and android.test classes were removed from the API. Unfortunately, those changes did not take into account that some of those packages target earlier API versions and so will always have the classes available at runtime. This change replaces those static dependencies with dynamic dependencies for any package that targets an earlier API version. The file changes were made automatically by a tool that constructed and then analyzed a full dependency graph of all the Android Java modules. The individual changes were checked manually to ensure that the changes matched the intent. The affected modules were built against an API with the junit and android.test classes removed. Any issues found during this process resulted in either the tool being updated to address the issue or a separate change being made to fix an existing problem with the build. A sample of the affected packages were run to ensure that they worked as expected at runtime; no issues were found during testing. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because Browser2's manifest file (AndroidManifest.xml) targets API level 24 and dynamically includes the android.test.runner library at runtime so there is no point in statically including the classes. Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module Browser2 builds against 'LOCAL_SDK_VERSION := current' and uses classes from package android.test (possibly indirectly) so will no longer compile once they are removed from the API. Bug: 30188076 Test: make checkbuild and ran a sample of tests Change-Id: I78863420bcfd401b63b35ef5a9252024d1550b27
2017-03-03Prepare for removal of junit and android.test classes from Android API (step ↵android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releasePaul Duffin
1) am: bb53fd26f3 am: decae51067 am: f5d490932f Change-Id: I046af09165cfb997465f1fbeda8fbd71147c6df0
2017-03-03Prepare for removal of junit and android.test classes from Android API (step ↵Paul Duffin
1) am: bb53fd26f3 am: decae51067 Change-Id: I6f771558e4712f07897ee17a842ae95bdce5627a
2017-03-03Prepare for removal of junit and android.test classes from Android API (step 1)android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4Paul Duffin
am: bb53fd26f3 Change-Id: I9d455abb345da178714f889608e221ee3440b945
2017-03-01Prepare for removal of junit and android.test classes from Android API (step 1)android-o-preview-1android-n-mr2-preview-2o-previewPaul Duffin
In preparation for removing junit and android.test classes from the Android API this change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Care was taken to ensure that any targets that depended, directly or indirectly, on android-support-test did not also depend on junit or hamcrest as they conflict with the versions embedded within android-support-test. Bug: 30188076 Test: make checkbuild Change-Id: I0cb8c39bdfbefb92db48c30815ee4902d13a3fed
2017-02-23Use registered users in Browser2 OWNERS files. am: 2984ebd99e am: 2172d242ebChih-Hung Hsieh
am: 35a9b815ed Change-Id: I1f8353afda31c67166b30e58744e995bed608123
2017-02-23Use registered users in Browser2 OWNERS files. am: 2984ebd99eChih-Hung Hsieh
am: 2172d242eb Change-Id: I47c4d71374c34c8c582e0a724b3372d5d82cf0fd
2017-02-23Use registered users in Browser2 OWNERS files.Chih-Hung Hsieh
am: 2984ebd99e Change-Id: I62625370739496d3bf720b339f8e96e20ef8ef3e
2017-02-23Use registered users in Browser2 OWNERS files.Chih-Hung Hsieh
AOSP project owners should be registered in Gerrit Code Review. Bug: 33166666 Test: default build targets Change-Id: I5f8be8ab53f8ec785bee6703f8012d834162ad32
2016-06-03Bump targetSdkVersion to 24 am: 12065ec79e am: 2d974e22fbBill Yi
am: 4dbfc60c0c * commit '4dbfc60c0ca76a087bb01156e7803a76d6815b91': Change-Id: Idfbc26b052ed6ee40b3c1feaf4380043117bdaee
2016-06-03Bump targetSdkVersion to 24 am: 12065ec79eandroid-n-mr2-preview-1Bill Yi
am: 2d974e22fb * commit '2d974e22fb685fb2074defa981304d616c9f21c5': Change-Id: Ic9066efbd0b85c656d62e251024a9ed9ef147cbf
2016-06-03Bump targetSdkVersion to 24 am: 12065ec79e am: c24a10e63dBill Yi
am: fd7598b103 * commit 'fd7598b103b0a39a9433aaabd768172f57c29be2': Bump targetSdkVersion to 24 Change-Id: I56df683c9b9d2c7b0b07e292c53f471f8faac705
2016-06-03Bump targetSdkVersion to 24 am: 12065ec79eBill Yi
am: c24a10e63d * commit 'c24a10e63dba19b85b42590b968193053d43cd92': Bump targetSdkVersion to 24 Change-Id: Ia88cbbf10ff92a40a82af8474093e0c26408c52b
2016-06-03Bump targetSdkVersion to 24android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseBill Yi
am: 12065ec79e * commit '12065ec79e269597386d335e3dce005f8fc489b1': Bump targetSdkVersion to 24 Change-Id: I792c10375c1d414a29eed4ddb5dc858f874b43d0
2016-06-03Bump targetSdkVersion to 24android-n-mr1-preview-2android-n-mr1-preview-1Bill Yi
am: 12065ec79e * commit '12065ec79e269597386d335e3dce005f8fc489b1': Bump targetSdkVersion to 24 Change-Id: Ia7cf1f9c15e5d9355518a1e8450ce28fd00f3f7d
2016-06-02Bump targetSdkVersion to 24nougat-devBill Yi
This will only affect AOSP build. BUG:28621267 Change-Id: Ic47567cb950fa8a43cb244182ae035d140dda97c
2016-01-26Use the new version of shouldOverrideUrlLoadingMikhail Naganov
Bug: 22346196 Change-Id: Ifc2a343a5ab09275563f63c7a2529dd67897cb18
2016-01-22Update Browser with the current code from the Chromium treeandroid-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Mikhail Naganov
Synced WebViewBrowserActivity, manifest and resources up to the state of the Chromium tree at refs/heads/master@{#371018} Differences from the Chromium version: -- WebViewBrowserActivity uses android.util.Log instead of org.chromium.base.Log, thus difference in call parameters; -- relative class names are used for Activity classes in the manifest file. Change-Id: I9af67200e82c17d76347a1ca4ffb060be3e777bf
2015-07-24Merge "Add intent-filter with MIME types"marshmallow-devPaul Miller
2015-07-23Merge "Restore OWNERS"Paul Miller
2015-07-23Restore OWNERSPaul Miller
BUG:19351071 Change-Id: If5f0d4ac96dae76debb61a31def21ba9da6c960b
2015-07-23Add intent-filter with MIME typesPaul Miller
BUG:19351071 Change-Id: I6ef53ed1a3ebe52f2d297da0b7997ea18840118f
2015-07-22Update full browser instructions URLPaul Miller
BUG:19351071 Change-Id: Ieee1f5622ca036a89cdaff8d853151b664554580
2015-07-20Copy WebViewShell to Browser2Paul Miller
This code is from chromium, at android_webview/tools/WebViewShell. The only changes are the addition of Android.mk and README, the removal of OWNERS, and the move of strings into strings.xml Change-Id: Idf86bbf087d122b6bc0a739451ad9312260c149d
2015-07-09Initial empty repositoryAlex Cheung