Xiaohui Chen
23063be549
Merge "intellij-gen: fix git root problem"
2015-05-08 16:06:00 +00:00
Geoff Mendal
cfec821074
Import translations. DO NOT MERGE
...
Change-Id: I4b83719c396897c046da4d206146bfc640e45f1c
Auto-generated-cl: translation import
2015-05-01 19:37:44 -07:00
Xiaohui Chen
e472fe6d27
intellij-gen: fix git root problem
...
Some module dir may not be the git root itself. Some modules may
share the same git root. e.g. "development/tools/apkcheck" module's
git root is "development/". So we need to look at the parent
directories too when going through all the modules.
Change-Id: Id2ce859efc0d5f6286eb8545fd6a21244e7d40a6
2015-04-29 20:50:18 -07:00
Xiaohui Chen
8145bd2753
Merge "intellij-gen: fix framework dependencies"
2015-04-29 17:17:14 +00:00
Xiaohui Chen
2821fcb134
Merge "intellij-gen: default to use jdk 1.7"
2015-04-29 17:12:51 +00:00
Geoff Mendal
6d3823b081
Import translations. DO NOT MERGE
...
Change-Id: I8aaebdb327d41ac7e11ee0ea166307b0f980a42c
Auto-generated-cl: translation import
2015-04-29 07:09:14 -05:00
Xiaohui Chen
b6615dc7f0
intellij-gen: default to use jdk 1.7
...
1.7 language features seems already used in Android codebase. Let's
move the generated project config to match that.
Change-Id: I0269f2e73417393bcd7894356caaea5c48b9d0e1
2015-04-27 14:45:10 -07:00
Geoff Mendal
3e691651b2
Import translations. DO NOT MERGE
...
Change-Id: I59f01c002066b71b1039ca0dbbbbef0efcaa4c47
Auto-generated-cl: translation import
2015-04-24 23:33:17 -07:00
Geoff Mendal
d3ee0196b2
Import translations. DO NOT MERGE
...
Change-Id: I09d42ebdc9db6569f948ab3e3f3d83e3123ad932
Auto-generated-cl: translation import
2015-04-22 07:10:14 -05:00
Xiaohui Chen
27639ae3db
intellij-gen: fix framework dependencies
...
FrameworkModule has special case dependencies generation. It is
currently missing some. This cl fixes that and also fixed an edge case
when finding src directories.
Change-Id: I1593d92530715f3bbc8683cc32164fde4a29f0d8
2015-04-06 14:19:13 -07:00
Geoff Mendal
6db630d8db
Import translations. DO NOT MERGE
...
Change-Id: I7d32af81fdb48a4a5641fbdcb85b9012dbb29af4
Auto-generated-cl: translation import
2015-03-21 01:24:46 -05:00
Elliott Hughes
6243e0ec4b
am 5f454f03: am 19fbca0a: Merge "Remove elftree."
...
* commit '5f454f031f14362846c782e3862d4a9c0b56c9e0':
Remove elftree.
2015-02-18 00:28:37 +00:00
Elliott Hughes
c5997d72dd
am fe7c8b69: am 7a35b085: Merge "Use the exported elfutils headers."
...
* commit 'fe7c8b693ddd8b4250cdb0dd0e5815966ddd0c20':
Use the exported elfutils headers.
2015-02-18 00:28:28 +00:00
Elliott Hughes
cbcbb5539d
am a865d35c: am 092ddc95: Merge "Clean cruft out of the elftree makefile."
...
* commit 'a865d35c48a9239980a589eaf5974333fbb32e79':
Clean cruft out of the elftree makefile.
2015-02-18 00:28:21 +00:00
Elliott Hughes
5f454f031f
am 19fbca0a: Merge "Remove elftree."
...
* commit '19fbca0a9d73841a5cf9c7265e4711e0ed2cdf23':
Remove elftree.
2015-02-17 21:36:01 +00:00
Elliott Hughes
33937e0edf
Remove elftree.
...
Other than the original commit (from an author who's long gone), the
only people who've ever touched elftree are us, fixing the build on
many different occasions. It's not referenced anywhere else in the
tree, so let's find out if anyone's actually using it...
Change-Id: I5c6163064d64ba686b796f7886b19cf330069a94
2015-02-17 13:22:33 -08:00
Elliott Hughes
fe7c8b693d
am 7a35b085: Merge "Use the exported elfutils headers."
...
* commit '7a35b08548fbdadd43b79f98297d0d7cf2fea1c5':
Use the exported elfutils headers.
2015-02-17 21:16:59 +00:00
Elliott Hughes
a865d35c48
am 092ddc95: Merge "Clean cruft out of the elftree makefile."
...
* commit '092ddc95f04c74ebd928c194e7a7af113f7a0337':
Clean cruft out of the elftree makefile.
2015-02-17 21:09:41 +00:00
Elliott Hughes
bfe6908093
Use the exported elfutils headers.
...
Change-Id: I792507de67da32fe9a5db55760e9a81070c7e721
2015-02-15 11:51:16 -08:00
Elliott Hughes
3dbc29e17a
Clean cruft out of the elftree makefile.
...
Change-Id: I5a14c42297331f0a44b9d753f3fe754433b96f98
2015-02-15 11:40:28 -08:00
Nick Korostelev
3a04958b9c
Merge "Cleaned up usages of deprecated APIs"
2014-12-11 23:47:10 +00:00
Nick Korostelev
e7741e1328
Cleaned up usages of deprecated APIs
...
Change-Id: I754293e52aa7c313d894f27cfecd083ae63d6445
2014-11-18 16:21:14 -08:00
Paul Crowley
7fdedf010d
Refactor the way we handle directories in traverse.
...
Bug: 18064146
Change-Id: I45fba9c2978bc0c8f23804c730ab631da759ac70
2014-11-03 04:28:54 +00:00
Baligh Uddin
5fd0e38c0a
Import translations. DO NOT MERGE
...
Change-Id: Iefd0773327c4d0aa246381ea63b94b898cfcc75f
Auto-generated-cl: translation import
2014-10-30 11:17:54 -07:00
Sky Faber
2247b043df
DO NOT MERGE: idegen: Skip directories named *.java when parsing source.
...
Change-Id: I8a6700ebcc198851b80de4832a43d147dc887f3a
(cherry picked from commit e83d6400fb )
2014-10-24 18:20:36 +00:00
Geoff Mendal
f1994d2827
Import translations. DO NOT MERGE
...
Change-Id: Ic7a6e949dfa1523f233c6ad03a0347713e340923
Auto-generated-cl: translation import
2014-10-15 16:14:10 -07:00
Ruben Brunk
626cf05e7e
Merge "idegen: Skip directories named *.java when parsing source."
2014-10-07 20:16:43 +00:00
Tor Norbye
b6b7487e23
Bug 17782530: Annotations using retention policy source remain in .class
...
Change-Id: I763e99c243d85406162e3b898fe1e5af8c216173
2014-10-06 16:21:36 -07:00
Tor Norbye
0eac39db90
17782530: Annotations using retention policy source remain in .class
...
Change-Id: Ia62e0d6ef5024515567be6564197e723f0013ee0
2014-10-04 18:49:35 +00:00
Kenny Root
b0d83cf4db
make_key: reduce raciness of password input
...
(cherry picked from commit 7f3f83e0e3 )
Bug: 14595245
Change-Id: I8a9e4f2c46aa3c85763975c5cb7a47df197f7746
2014-07-31 16:04:20 -07:00
Sky Faber
e83d6400fb
idegen: Skip directories named *.java when parsing source.
...
Change-Id: I8a6700ebcc198851b80de4832a43d147dc887f3a
2014-07-23 13:50:52 -07:00
Baligh Uddin
dbd7a9fbdf
Remove deprecated locales - DO NOT MERGE
...
Change-Id: If073e059cb3161240952fafde16878c502c69341
2014-07-19 13:04:57 -07:00
Baligh Uddin
23b0060966
Remove deprecated locales
...
Change-Id: If4583aeb25e54c3507206a298e817d26bc3f52d5
2014-07-18 11:42:38 -07:00
Baligh Uddin
d32a99f2df
Remove deprecated locales
...
Change-Id: I9b911cbe316b16390d773bb0cc1252ff96bfd30b
2014-07-17 15:42:53 -07:00
Baligh Uddin
4b69c37f13
Import translations. DO NOT MERGE
...
Change-Id: I2f1bfc0cf656725c24986e167e64cb9b47099c79
Auto-generated-cl: translation import
2014-07-06 04:13:58 -07:00
Baligh Uddin
6f5610e8f4
Import translations. DO NOT MERGE
...
Change-Id: I29a847229dc5048e6311586c837e49b8f77f8535
Auto-generated-cl: translation import
2014-06-30 14:44:01 +00:00
Ying Wang
3016ff6d0a
am c8ed8c25: am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
...
* commit 'c8ed8c25bc796cd82fb1df0ea100e320a542eeb3':
Switch to SDK_HOST_ARCH
2014-06-11 19:26:28 +00:00
Ying Wang
bcfa67e56d
am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
...
* commit '1e1b10acd152ae67670587ef1682ba6a3ed8a66c':
Switch to SDK_HOST_ARCH
2014-06-10 16:28:00 +00:00
Ying Wang
e7db94431e
Switch to SDK_HOST_ARCH
...
SDK_HOST_ARCH will be x86 if we are doing 32-bit host multilib build,
in which HOST_ARCH is actually x86_64.
Bug: 13751317
Change-Id: I8b7893b10cc4d0e71076b3b3625ec2f352aa8602
2014-06-09 15:03:04 -07:00
Steve Moyer
e561dd4846
DO NOT MERGE: fix package for AndroidJUnitRunner
...
Change-Id: I6b3fb006212f273d018121800d1d94e8a8d7404d
2014-06-04 09:59:22 -07:00
Steve Moyer
23a8adf276
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest
Conflicts:
build/sdk.atree
Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-06-04 09:55:31 -07:00
Evan Charlton
ffa8245e66
Add support for OSX to intellij-gen.sh
...
Remove the hardcoded "linux-x86" path, and add support for darwin-x86.
Change-Id: I4c5db4683a6e8aac7d894e64415142d2ca5954a2
2014-05-20 10:55:54 -07:00
Evan Charlton
10163e76fc
am 311e3662: Merge "Merging emulator smoke test projects" into master-nova
...
* commit '311e3662bdaec82c621fd3b04c4505ce60d2df15':
Merging emulator smoke test projects
2014-05-13 15:19:06 +00:00
Baligh Uddin
31078f7fbd
am 3b842a86: keep history after reset to master-nova-dev
...
* commit '3b842a8628da809286b810b6881e382890ead1f6':
2014-05-13 15:18:49 +00:00
Chiao Cheng
c8201d5e84
Overhaul of intellij-gen script.
...
Overall much better at find proper dependencies.
* No more need for aggregate modules.
* Source file searching.
* Make file token substitution.
* Inclusion src directories.
* Multi project/package support.
* Made framework module optional as some unbundled
branches do not include it.
Change-Id: Ie5ee66c488fc9141043137f716a3891f952bfe7f
2014-03-17 12:52:43 -07:00
Steve Moyer
b99f97d38e
Merging emulator smoke test projects
...
Combining SmsTest, GpsLocationTests, and ConnectivityTest
Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
2014-03-03 15:28:02 -08:00
Steve Moyer
138d520cf7
Merging emulator smoke test projects
...
Combining SmsTest, GpsLocationTests, and ConnectivityTest
Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
2014-02-20 10:26:59 -08:00
Steve Moyer
128ba33143
Add up to 6 10 second delays to wait for sms
...
Change-Id: I59a4542d70e56bf9442e2bb075c6a0a5a0454fb3
2014-02-18 16:44:38 -08:00
Steve Moyer
a7524da862
Adding test tag to sms test
...
Change-Id: Ie8ef012cf07715582b602e75a2ba19dfe1c22a29
2014-02-11 18:36:07 -08:00
Steve Moyer
cc08ee921a
Add SMS test to verify emulator can receive sms from DDMS
...
Change-Id: I168a8c75df76eb997ac5abf06a10437881bdff76
2014-02-10 16:13:52 -08:00