14442 Commits

Author SHA1 Message Date
Yohei Yukawa
69ceec9045 Re-introduce <uses-sdk> to the main AndroidManifest.xml
This logically reverts my previous CL [1], which moved <uses-sdk />
from AndroidManifest.xml to AndroidManifest_SdkVersion.xml, which was
later accidentally removed during Android.bp migration [2].

Since gradle support in LatinIME is still experimental and not used in
official build, it is OK to keep it broken for a while.  A more
important problem right now is letting LatinIME target API 28.

As the first step to let LatinIME target SDK 28, <uses-sdk> will be
revived in AndroidManifest.xml

 [1]: Ib673bca5a31b2f95329c9310a127ec0701bd8fdc
      9cd42f39eb31d4f0b9cb3a795025e8ab3663f3c8
 [2]: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
      22ebec6e2e4bdf3f18023907e649c68ab8b3c7a3

Bug: 110741422
Bug: 119489995
Test: manually verified that LatinIME still is functional
Change-Id: I8b04caa56fe2431c07e076fb6f97c560d5da8838
2018-11-13 13:49:23 -08:00
TreeHugger Robot
0b6f4bb0a6 Merge "Import translations. DO NOT MERGE" 2018-11-10 15:02:17 +00:00
TreeHugger Robot
f1f7f05512 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-11-10 14:44:20 +00:00
Bill Yi
9727374039 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If1a85bd7e787396faf8fb780a96e598c81dc4087
2018-11-10 00:11:52 -08:00
Bill Yi
af30ac8326 Import translations. DO NOT MERGE
Change-Id: Iec7f8162a5f1fa6323b5aaad028982d27ae4d703
Auto-generated-cl: translation import
2018-11-10 00:10:48 -08:00
Bill Yi
968f11511b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6dd75f52e619fdc8c3d54ea223f0e35171b3bc1c
2018-11-09 23:52:56 -08:00
Bill Yi
517e77569e Import translations. DO NOT MERGE
Change-Id: I2cf19a83bd266325c4a1b37344bdab61753cdbca
Auto-generated-cl: translation import
2018-11-09 23:51:36 -08:00
Dan Willemsen
948cbbe986 Merge "Convert to Android.bp" am: 128f68acb2
am: 8e315deff9

Change-Id: I9d256889dbc4717293cff2b0ddd6e867ae54e47d
2018-11-08 17:03:45 -08:00
Bill Yi
2a04a34ee7 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I075d4469fed4c68a77c131c2f9d76ec283fe0b04
2018-11-06 05:31:13 -08:00
Bill Yi
13611e7a26 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I42759929af5c662c4b5d306b4967e67f5ad05547
2018-11-02 11:02:18 -07:00
Dan Willemsen
a23407bf62 Convert to Android.bp
See build/soong/README.md for more information.

Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
Merged-In: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
2018-11-01 23:09:33 +00:00
Dan Willemsen
22ebec6e2e Convert to Android.bp
See build/soong/README.md for more information.

Test: cd packages/inputmethods/LatinIME; mma
Change-Id: Ib8867d3b74f09fc1d9f95adc9a49a81ac0f7f054
2018-10-31 21:49:02 -07:00
Tadashi G. Takaoka
b6301306fa Merge "Fix dicttool build" am: a92d0f9262 am: 438a303732
am: 6aed05232b

Change-Id: I558fb5ff22a7428d1d82eac82b4caba469ed48d4
2018-10-31 09:24:08 -07:00
Tadashi G. Takaoka
6aed05232b Merge "Fix dicttool build" am: a92d0f9262
am: 438a303732

Change-Id: If8b5ba833fa6872fcaeb43dbd7b0b0c9a5c65986
2018-10-31 09:18:51 -07:00
Tadashi G. Takaoka
6a1b37353d Fix dicttool build
This CL partially reverts
  - Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c
  - I05c7d8429e8d9a26139456763c77997340fea8c2
And followup (remove shortcut support)
  - I73b7dc008a5acaf75a31a36a2d332b5afabd82d0

Bug: 28255684
Test: make -j10 dicttool_aosp
Change-Id: I2e01ed86b9517a1141aee35ea6d8ef39258981d1
2018-10-29 15:59:05 +09:00
Bill Yi
9855237563 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I27785eae6f6e44e130a7cad0cfedeb8ed630e95f
2018-10-28 14:41:50 -07:00
Bill Yi
9c8608c642 Import translations. DO NOT MERGE
Change-Id: I60b4bb2939b9e6bb73072b3c2e96ca197c41f6f2
Auto-generated-cl: translation import
2018-10-25 06:24:18 -07:00
Bill Yi
67efbc844c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8f0f4691bcdb730d71feae0616c65f1e38b99b06
2018-10-15 09:48:59 -07:00
TreeHugger Robot
fe42418de4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:56 +00:00
TreeHugger Robot
5958fb4cbc Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:54 +00:00
TreeHugger Robot
0ca0ed10c3 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:47:35 +00:00
TreeHugger Robot
f1e3e4c5a8 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:46:38 +00:00
TreeHugger Robot
051ebe1f67 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2018-10-14 02:44:16 +00:00
Bill Yi
54e8416096 Import translations. DO NOT MERGE
Change-Id: Id26d6b48ca52c631b3f2041682663f07b49e4b80
Auto-generated-cl: translation import
2018-10-13 08:35:07 -07:00
Bill Yi
946631933a Import translations. DO NOT MERGE
Change-Id: I76dbccb4e65ebb99db55049222d6fe361d08d9fc
Auto-generated-cl: translation import
2018-10-13 08:34:10 -07:00
Bill Yi
b0fc52fca9 Import translations. DO NOT MERGE
Change-Id: I0606bc4b8d8c37ef386f1af4764a6887b86017f5
Auto-generated-cl: translation import
2018-10-13 08:32:35 -07:00
Bill Yi
4f8a5c0dd6 Import translations. DO NOT MERGE
Change-Id: Id8ca0f5d84e52df495611542f8c52e63329d531a
Auto-generated-cl: translation import
2018-10-13 08:31:41 -07:00
Bill Yi
819b30680c Import translations. DO NOT MERGE
Change-Id: I915ddb171c85d7f9f1428bb52e60727a9e254a60
Auto-generated-cl: translation import
2018-10-13 08:30:21 -07:00
Bill Yi
3725a3fbca Import translations. DO NOT MERGE
Change-Id: I521ffadf560fd919a12387844ba6799a024884b1
Auto-generated-cl: translation import
2018-10-13 08:28:46 -07:00
TreeHugger Robot
8353ab156f Merge "Import translations. DO NOT MERGE" into pi-dev 2018-09-29 21:29:24 +00:00
TreeHugger Robot
8f67a3867c Merge "Import translations. DO NOT MERGE" into pi-dev 2018-09-29 21:26:16 +00:00
Bill Yi
49192ae51d Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9784cfcb5280e415a04ad109c5ddee33997f7261
2018-09-28 21:46:47 -07:00
Bill Yi
dacc99b4c5 Import translations. DO NOT MERGE
Change-Id: I46a499dd1da79f06718cddfd3eafed8123a05967
Auto-generated-cl: translation import
2018-09-28 21:46:01 -07:00
Bill Yi
7eb444bd3f Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib422a258a32e4a483c7e0713f3aadcaf8de7f512
2018-09-28 21:43:34 -07:00
Bill Yi
5cf980e6bc Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If0632d69913ac40f1723faa89272cece8b83f1a0
2018-09-28 21:33:11 -07:00
Bill Yi
47ce19e9dd Import translations. DO NOT MERGE
Change-Id: Ib23c52e3e48c46d621a99838f101982d17308d43
Auto-generated-cl: translation import
2018-09-26 20:54:53 -07:00
Bill Yi
0adefed05a Import translations. DO NOT MERGE
Change-Id: Ie1e3f7f1f5c270873cecd1b84cffbb2998a09423
Auto-generated-cl: translation import
2018-09-21 16:50:32 -07:00
Bill Yi
5acbc37fd4 Import translations. DO NOT MERGE
Change-Id: Ic2ea9113d32f5c0e0a13ab87b0dca6f71ea3dd78
Auto-generated-cl: translation import
2018-08-30 16:48:29 -07:00
Bill Yi
15c37f8bab Import translations. DO NOT MERGE
Change-Id: Ie86b819785a70d5613155360f4551c77b6bf0fd0
Auto-generated-cl: translation import
2018-08-07 17:37:26 -07:00
TreeHugger Robot
8d19c8cbf7 Merge "Import translations. DO NOT MERGE" 2018-08-02 05:34:55 +00:00
Bill Yi
e2610221be Import translations. DO NOT MERGE
Change-Id: I4d394e997b58cd7dd2768861a3da887fdb7c1c6d
Auto-generated-cl: translation import
2018-08-01 20:27:35 -07:00
Bill Yi
7305b0b41e Import translations. DO NOT MERGE
Change-Id: Ifaf4318866c3ba72adee1190e0dfce8506fbd7b0
Auto-generated-cl: translation import
2018-08-01 20:27:24 -07:00
Yohei Yukawa
c884b6631f Let Android Studio use 'shared' cert to build APK
make build uses 'shared' cert in build/make/target/product/security/.
If LatinIME APK built with AndroidStudio doesn't use the same signing
cert, then you cannot install the APK into AOSP image, which is not
convenient.

With this CL, AndroidStudio build also uses the same signing cert.

Note that shared.keystore was built as follows.

 $ openssl pkcs8 -inform DER -nocrypt                      \
   -in build/make/target/product/security/shared.pk8       \
   -out shared.pem
 $ openssl pkcs12 -export                                  \
   -in build/make/target/product/security/shared.x509.pem  \
   -inkey shared.pem -out shared.p12                       \
   -password pass:android -name AndroidDebugKey
 $ keytool -importkeystore -deststorepass android          \
   -destkeystore shared.keystore -srckeystore shared.p12   \
   -srcstoretype PKCS12 -srcstorepass android

Fix: 110741422
Test: made sure that the APK built with Android Studio can be
      installed to an AOSP build
Change-Id: I471a87e190b15ff02bb06849e4660ed7898897a5
2018-07-25 18:08:35 -07:00
Yohei Yukawa
41f89ae88c Specify version code in AndroidManifest.xml
This should be the most convenient way for both make build and Android
Studio build to share the same version code.

Bug: 110741422
Test: tapas LatinIME LatinIMETests arm64 userdebug && make -j
Change-Id: I35f850c392553b2640a4c3c7398441ac28e90eca
2018-07-25 17:08:47 -07:00
Yohei Yukawa
9cd42f39eb Move <uses-sdk /> to a differnt XML
Basically Android Studio does want targetSdkVersion to be specified in
build.gradle rather than AndroidManifest.xml.  To make both make build
and Android Studio build happy, this CL splits <uses-sdk /> from the
main AndroidManifest.xml to a different file and let them merged in
make build.

There should be no behavior change.

Bug: 110741422
Test: Manually verified that there is no difference in
      AndroidManifest.xml in the APK.
Change-Id: Ib673bca5a31b2f95329c9310a127ec0701bd8fdc
2018-07-25 14:21:09 -07:00
Bill Yi
501ff64cfd Import translations. DO NOT MERGE
Change-Id: I55e880457966992e25acd30cc65390e80fa4a515
Auto-generated-cl: translation import
2018-07-21 20:50:09 -07:00
TreeHugger Robot
992d47a237 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-07-20 18:36:38 +00:00
TreeHugger Robot
a824eac6e2 Merge "Import translations. DO NOT MERGE" into pi-dev 2018-07-20 18:14:33 +00:00
Bill Yi
1754bcd410 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0a07d63a0916cf33bbebcf68bd58bef0dfb91826
2018-07-19 21:21:33 -07:00
Bill Yi
315da31882 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ifffe3a45508e97013f768a0f7949cb2f8571acee
2018-07-19 21:20:48 -07:00