Commit Graph

40882 Commits (a92d0f926269264e578c9162c5df230cafb99b7c)

Author SHA1 Message Date
Paul Duffin 2ccdf50ae2 Flatten dependency hierarchy of legacy-android-test
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.

* tests/Android.mk
    Replaced 'legacy-android-test' with 'android.test.runner.stubs' in
    LOCAL_JAVA_LIBRARIES because LatinIMETests'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
    LatinIMETests specifies in its manifest.

Bug: 30188076
Test: make checkbuild
Change-Id: I3c70889b35d402626f79c986771b9c2ea8823b8a
2017-12-05 18:36:57 +00:00
android-build-team Robot d42f5ae194 Snap for 4481641 from 17b2ad33b3 to pi-release
Change-Id: Ic828b443a02cfbd7b097b51844815c09c6104209
2017-12-03 08:26:14 +00:00
TreeHugger Robot 17b2ad33b3 Merge "Import translations. DO NOT MERGE" 2017-12-01 08:38:30 +00:00
TreeHugger Robot e3b9274f72 Merge "Import translations. DO NOT MERGE" 2017-12-01 08:31:24 +00:00
Bill Yi 3fc52c759c Import translations. DO NOT MERGE
Change-Id: I04edbba85dc4d86470666ec0ff9bad841af7524a
Auto-generated-cl: translation import
2017-11-30 16:23:02 -08:00
Bill Yi 1fb66b791f Import translations. DO NOT MERGE
Change-Id: I4e7b720ad4a2493ac24a44e66a4c52f8ef63ceac
Auto-generated-cl: translation import
2017-11-30 16:22:35 -08:00
Bill Yi d1a4333ce0 Import translations. DO NOT MERGE
Change-Id: Ib36b48a0a806dc351ffba5a5581f85c017ca348a
Auto-generated-cl: translation import
2017-11-30 16:22:18 -08:00
android-build-team Robot 51bd0b8620 Snap for 4476081 from 6473e72066 to pi-release
Change-Id: Iad794d2dbf1ae3aa28fbed5d1c4859f81e100ce0
2017-11-30 08:51:04 +00:00
Bill Yi 6473e72066 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f99e090a59 -s ours
am: 6c15e41132  -s ours

Change-Id: I4ccdda15676463fc597708615c9050bc55d365e3
2017-11-30 01:57:45 +00:00
Bill Yi 6dcbe40953 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: b6355a66f7 -s ours
am: 3357121876  -s ours

Change-Id: I9cae8dbc6e32f4fa4782585844ed24ce7c40c8e7
2017-11-30 01:57:24 +00:00
Bill Yi 438d7c9cc3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: b9d6be45b3 -s ours
am: 972a9c71a5  -s ours

Change-Id: Ie421017314ec9c394e95c84be43779bbcda256c8
2017-11-30 01:57:04 +00:00
Bill Yi 29752fad72 Import translations. DO NOT MERGE am: 39973180c7 -s ours
am: fee92ba29d  -s ours

Change-Id: I533dfeef8074487d1814b21b7ac0a275752e8f9d
2017-11-30 01:56:31 +00:00
Bill Yi 6c15e41132 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: f99e090a59  -s ours

Change-Id: Ic128a8eb29da928630810de68c3604e4e635b880
2017-11-30 01:49:01 +00:00
Bill Yi 3357121876 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: b6355a66f7  -s ours

Change-Id: I772e5ea1e784322fe2fcfdf5b9a6f445d4749cbc
2017-11-30 01:48:37 +00:00
Bill Yi 972a9c71a5 Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: b9d6be45b3  -s ours

Change-Id: I7ebb09e31141a4da80df3c98f18b394c3224252e
2017-11-30 01:48:13 +00:00
Bill Yi fee92ba29d Import translations. DO NOT MERGE
am: 39973180c7  -s ours

Change-Id: I3efb84c5ca812217047f1c3a7ecbd645a25fa755
2017-11-30 01:47:48 +00:00
TreeHugger Robot f99e090a59 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-11-30 01:30:16 +00:00
TreeHugger Robot b6355a66f7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-11-30 01:30:00 +00:00
TreeHugger Robot b9d6be45b3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2017-11-30 01:26:34 +00:00
Bill Yi 83cce9a2c6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I27a8a609dbedec443ec0efcb5a9624a30109a2dd
2017-11-29 15:24:23 -08:00
Bill Yi c34ef720ca Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I24694255d2be60a04d11630f1f738b8e84eaeaa0
2017-11-29 15:14:33 -08:00
Bill Yi 507946daee Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I04fb48059e4b43c0093ff661dc15f7471f58821b
2017-11-29 15:12:28 -08:00
Bill Yi 39973180c7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 69925163
Change-Id: I0303d0946be41a5bea10906e4c83de2288720df0
2017-11-29 15:10:28 -08:00
android-build-team Robot cc226220be Snap for 4469253 from 7a38b2ca38 to pi-release
Change-Id: Id8d1bbdb1f1f94f7630b3dc3b0c7fc604979e4fb
2017-11-27 08:21:37 +00:00
Bill Yi 7a38b2ca38 Import translations. DO NOT MERGE
Change-Id: I9888f32b8fe115df2509ec58edf97fac514a6984
Auto-generated-cl: translation import
2017-11-26 11:33:43 -08:00
android-build-team Robot 986ac5809c Snap for 4462748 from 6020a29d49 to pi-release
Change-Id: Id6e97676186b560477ea3faa249b4bc25c015690
2017-11-21 08:30:34 +00:00
TreeHugger Robot 6020a29d49 Merge "Import translations. DO NOT MERGE" 2017-11-20 22:27:35 +00:00
Bill Yi 714c4d4dbf Import translations. DO NOT MERGE
Change-Id: I2ef7c3c9861f0b171d90c8224f5a9b11550a0482
Auto-generated-cl: translation import
2017-11-20 12:43:12 -08:00
android-build-team Robot 4960b4b117 Snap for 4459973 from 097130d198 to pi-release
Change-Id: Icd3ac740c8c6eb7f9ea23d80eafa361d457b3ef4
2017-11-19 08:27:54 +00:00
Paul Duffin 097130d198 Use a.t.mock.stubs instead of a.t.mock.sdk
Remove dependencies on android.test.mock.sdk as it is a duplicate of
android.test.mock.stubs and will be removed.

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.

* tests/Android.mk
    Replaced 'android.test.mock.sdk' with 'android.test.mock.stubs' in
    LOCAL_JAVA_LIBRARIES because android.test.mock.sdk has been
    deprecated.

Bug: 30188076
Test: make checkbuild
Change-Id: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1
2017-11-16 12:57:31 +00:00
android-build-team Robot 894724edfb Snap for 4453288 from 031c250ed2 to pi-release
Change-Id: I266f461b9b0267e773e122ebd5f2e4a7a62a9993
2017-11-15 08:37:23 +00:00
Xin Li 031c250ed2 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: a4843aaec0

Change-Id: I0462847f2e5bed2130ece4c1c729070189fd7849
2017-11-15 02:05:52 +00:00
Xin Li a4843aaec0 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I09ea85c7e1d2723c995b7713ebe2c0cd512c5838
2017-11-14 16:38:24 -08:00
Xin Li e2a1657453 Merge commit 'e6db3dd483747a8f3055c003c706b0c7e7f14db0' into HEAD
Change-Id: I1dc30ae47185eb72a0c0cda05b336c429c20d6de
2017-11-13 14:35:47 -08:00
android-build-team Robot e52d3243a0 Snap for 4439972 from 99a877b0e2 to pi-release
Change-Id: Ib56c779d7ae951a138710cb4d2b43bd774379422
2017-11-08 08:26:33 +00:00
Bill Yi 99a877b0e2 Import translations. DO NOT MERGE
Change-Id: Id418d38eb98ab8208f06e5c7af1ca796296937dd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-11-06 23:16:44 -08:00
android-build-team Robot a3e8464723 Snap for 4434599 from ae75ff8526 to pi-release
Change-Id: I55c06bc929c72f151c90d3795a8a536dee33105e
2017-11-05 07:31:49 +00:00
Chih-hung Hsieh ae75ff8526 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: a3addf1187 am: f886546409
am: d04a2c6eaf

Change-Id: Id718f12529fba122c4dcef1403e9284c5ba576a8
2017-11-03 00:56:55 +00:00
Chih-hung Hsieh d04a2c6eaf Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: a3addf1187
am: f886546409

Change-Id: I6087998abe17e2e37c9a2f67a27197681db218f3
2017-11-03 00:53:24 +00:00
Chih-hung Hsieh f886546409 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni"
am: a3addf1187

Change-Id: I92e0317804176a295c079aa81e7b01fc03a852d9
2017-11-03 00:51:12 +00:00
Chih-hung Hsieh a3addf1187 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" 2017-11-03 00:47:18 +00:00
Chih-Hung Hsieh fab2c3c0ea Use -Werror in packages/inputmethods/LatinIME/native/jni
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I6b91302908e147077bb4fd0a8718c39357337133
2017-11-02 10:18:54 -07:00
android-build-team Robot 1d2ee87f0c Snap for 4428213 from bd08799b4a to pi-release
Change-Id: Iadb3fd51e39101921f46e97bbbb3ef4e2b67597b
2017-11-01 08:07:35 +00:00
android-build-team Robot 7bad337018 Snap for 4425573 from e04f43ca92 to pi-release
Change-Id: Ib7bd5c7ed4f966893db12e957b7bb37aeef2a5a9
2017-10-31 08:08:31 +00:00
Bill Yi bd08799b4a Import translations. DO NOT MERGE
Change-Id: Ibbdbe5ae6503c20da9a53d82ee2cb3d68e11a397
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-10-30 17:24:56 -07:00
Chih-hung Hsieh e04f43ca92 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: f3681fed6d am: 707fd5c3d2
am: 4424dbc80b

Change-Id: If238e8ffc1e7c4f0d7b436fcc568fca4bb098d78
2017-10-30 19:56:45 +00:00
Chih-hung Hsieh 4424dbc80b Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" am: f3681fed6d
am: 707fd5c3d2

Change-Id: Ie6eb2d7f07c5cc734fe442315ecf57d68512180d
2017-10-30 19:45:38 +00:00
Chih-hung Hsieh 707fd5c3d2 Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni"
am: f3681fed6d

Change-Id: Ib83bfbc92d482f4b242255200da1311a00141cd6
2017-10-30 19:40:45 +00:00
Chih-hung Hsieh f3681fed6d Merge "Use -Werror in packages/inputmethods/LatinIME/native/jni" 2017-10-30 19:26:28 +00:00
android-build-team Robot d1b93b03a9 Snap for 4410151 from 01e4844599 to pi-release
Change-Id: I0558e7374b58edbb6f20db0b39b04772bc56657e
2017-10-21 08:02:44 +00:00