Commit Graph

2932 Commits

Author SHA1 Message Date
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
Baligh Uddin
44c0b09b7b Remove deprecated locales
Bug:11340849
Change-Id: Ic82f58c40a174d05093a3b3c52833584ac7a0de3
2013-12-09 22:00:10 +00:00
Ben Cheng
3332adb785 am e8ce7584: am 18e10d81: am 4a09318c: Merge "Temporarily disable elftree on darwin-x86"
* commit 'e8ce7584301f7fa72c83a124f4e2e909c0a63f03':
  Temporarily disable elftree on darwin-x86
2013-11-23 12:41:07 -08:00
Ben Cheng
18e10d81e3 am 4a09318c: Merge "Temporarily disable elftree on darwin-x86"
* commit '4a09318c1e6f2ffde53ac9219bb0e392228ef925':
  Temporarily disable elftree on darwin-x86
2013-11-22 17:22:11 -08:00
Ben Cheng
4a09318c1e Merge "Temporarily disable elftree on darwin-x86" 2013-11-23 01:15:49 +00:00
Ben Cheng
4a7c39c97b Temporarily disable elftree on darwin-x86
Change-Id: Ib4a73283ad18088de33da3c00278aae67c485fac
2013-11-22 17:02:53 -08:00
The Android Open Source Project
c61dbe23a4 Merge commit '8eccbd3b5d90b9f0557c9a01f49d45e98ac85a46' into HEAD 2013-11-22 16:46:47 -08:00
Kenny Root
5cd6376aed am a163fa90: am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation support"
* commit 'a163fa900395cf8ebc1bbd143becc6bf2433781d':
  make_key: add EC key generation support
2013-11-22 10:49:30 -08:00
Kenny Root
a163fa9003 am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation support"
* commit '7e0d5c29b33f3056aedcb44cb8cbae808c11c35d':
  make_key: add EC key generation support
2013-11-22 10:43:34 -08:00
Kenny Root
c9421a7ac6 Merge "make_key: add EC key generation support" 2013-11-22 18:37:38 +00:00
Ben Cheng
ad593476a8 am 23604216: am 45d19989: am 4b60b014: Merge "Switch to use elfutils 0.153"
* commit '236042169e83cf4cf1a1bcc28cc71cd0c3744aef':
  Switch to use elfutils 0.153
2013-11-21 23:00:08 -08:00
Ben Cheng
236042169e am 45d19989: am 4b60b014: Merge "Switch to use elfutils 0.153"
* commit '45d1998989aab744df954a0357cf1eed7d2123b1':
  Switch to use elfutils 0.153
2013-11-21 18:44:07 -08:00
Ben Cheng
75c68c9c53 Switch to use elfutils 0.153
Change-Id: Ie6ee5911949f6d32f39f1f8800ddf41550dedd95
2013-11-21 16:36:27 -08:00
Kenny Root
98356f64a8 make_key: add EC key generation support
Add the ability to create EC keys for use in creating ECDSA signatures.

Change-Id: Ia1654b69056413d66275ea6c55d8273f5f09f5c6
2013-11-06 09:25:28 -08:00
Tor Norbye
5b47af05d5 Re-enable typedef stripping
Change-Id: I128b06209223dfc79dc94645847f32df4cd11b1b
2013-09-21 12:37:44 -07:00
Baligh Uddin
501ecc50fc Import translations. DO NOT MERGE
Change-Id: Ie3decee38150b828ca6b4dd79b368bcf357000c0
Auto-generated-cl: translation import
2013-09-14 00:03:28 -07:00
Tor Norbye
784abcfaf1 Temporarily disable removing typedefs
Change-Id: Ief7cb3b570d2b36b7101f622ab77cbdf7d699e3e
2013-09-12 17:09:59 -07:00
Baligh Uddin
dfd89ed284 Import translations. DO NOT MERGE
Change-Id: Id816a500425dc981c2cacf2ca4244590b297418f
Auto-generated-cl: translation import
2013-09-11 15:17:43 -07:00
Baligh Uddin
abe977a1a0 Import translations. DO NOT MERGE
Change-Id: I2fab6ac7f7c64a96d376945e3ab8efdccb4e9dcc
Auto-generated-cl: translation import
2013-08-28 23:19:16 -07:00
Baligh Uddin
df1f9ce180 Import translations. DO NOT MERGE
Change-Id: I55f373813538f3b5bebf25d3fd0dcdd39cd57b42
Auto-generated-cl: translation import
2013-08-26 13:43:04 -07:00
Baligh Uddin
e4615ae08d Import translations. DO NOT MERGE
Change-Id: I3ee7318d1d1a1f395b2827e2e81101c4c149b549
Auto-generated-cl: translation import
2013-08-21 15:48:52 -07:00
Baligh Uddin
970abae927 Import translations. DO NOT MERGE
Change-Id: I0c334e86677a2418afb7b0003db3a55f534bbe36
Auto-generated-cl: translation import
2013-08-19 11:53:06 -07:00
Tor Norbye
11835f7fcb Add typedef removal tool
The rmtypedefs tool is inteded only for the Android build itself.

It is given a set of .class file folders, and it finds any .class
files within those folders that correspond to "typedef annotations":
these are annotation classes that themselves have been annotated with
@IntDef or @StringDef. These typedefs should all be using
@Retention(RetentionPolicy.SOURCE), something this tool will check and
report if not the case.

However, even if an annotation only has source level retention, the
annotation class *itself*, will still be created as a .class file.  We
don't want these annotations in the Android system image, so this tool
is used to find and nuke the corresponding .class files for the
annotations themselves.

Change-Id: Ia343cc5bdbf215ded24b4354f3d92f5a9076eae3
2013-08-13 14:56:13 -07:00
Siva Velusamy
a4d9ccb36a Disable proguard for emulator tests
Change-Id: I3aeb201d2c9f5e51933d2284845ce42d3b477ee2
2013-05-23 14:24:12 -07:00
Brian Carlstrom
45db470c4d am 4889f155: am ae5b0e56: Merge "Move jdwpspy from development to dalvik (1 of 2)"
* commit '4889f1558a7cc4d8dee552aeba6873c4a48bbd09':
  Move jdwpspy from development to dalvik (1 of 2)
2013-05-22 11:45:21 -07:00
Brian Carlstrom
4889f1558a am ae5b0e56: Merge "Move jdwpspy from development to dalvik (1 of 2)"
* commit 'ae5b0e56a8e4fb8e5764ff0e389afec92c01ecfe':
  Move jdwpspy from development to dalvik (1 of 2)
2013-05-22 11:27:44 -07:00
Brian Carlstrom
8817244622 Move jdwpspy from development to dalvik (1 of 2)
(cherry picked from commit ac172802b01a010559dfb251824d5a4ab828e32a)

Change-Id: I53a1db8db511170cde8cffe3d6b9aa9ac80a65a7
2013-05-21 21:01:33 -07:00
keunyoung
8aea29c6a6 am ce0385a4: Merge "move emulator HALs to device/generic/goldfish" into jb-mr2-dev
* commit 'ce0385a450b416e2b9d9ff1432d4c0bc9690125b':
  move emulator HALs to device/generic/goldfish
2013-03-11 21:52:39 +00:00
keunyoung
e39f0b3ea1 move emulator HALs to device/generic/goldfish
Change-Id: I1ff304d540c75c4d27c5fddeb7315e177d366fb3
2013-03-11 10:55:13 -07:00
Ying Wang
cbb4e77e51 am b74c3ef7: am f39c1088: am 7b9e308b: Merge ""debug" in those modules is discouraged"
* commit 'b74c3ef70bd124cabb9c0d57a95a05b4e2b30c43':
  "debug" in those modules is discouraged
2013-03-08 01:36:39 +00:00
Ying Wang
b74c3ef70b am f39c1088: am 7b9e308b: Merge ""debug" in those modules is discouraged"
* commit 'f39c1088f08e194a212f55a246bac85036f62a42':
  "debug" in those modules is discouraged
2013-03-07 17:32:46 -08:00
Chiao Cheng
6818901ea0 Add support for distribution folder.
Changed template directory to be dynamically looked up.

Change-Id: I89b96581e842574e1c7ad36e8633d3e787f488c2
2013-03-01 10:55:30 -08:00
Ying Wang
75ac6f2897 "debug" in those modules is discouraged
Because we need those modules for only emulator builds.
If you mark them as "debug", you'll get them even if you are doing a
real device userdebug/eng build.
Instead, we should add their module names to the emulator product config
in build/target/product/emulator.mk.

Bug: 8276818
Change-Id: I58988ce49804583b06e7d93380c44ba800448216
2013-03-01 09:49:44 -08:00
Chiao Cheng
d7a603c968 Allow bash scripts to work within a distributation folder.
- Fixed NullPointerException when module name not found.

Change-Id: I8f9b29f047ff90995d4cccc6b4b518bfbf026570
2013-02-28 15:25:05 -08:00
Jesse Hall
843ea83d9c Merge "Fix glShaderSource parameter constness" 2013-02-23 04:56:37 +00:00
Jesse Hall
a0579871af Fix glShaderSource parameter constness
Change-Id: I1008d779a9d333dc8968812d22e387b804e3c570
2013-02-15 14:19:35 -08:00