Eric Shienbrood
af43695f97
Merge branch 'readonly-p4-master'
2009-04-15 06:59:53 -07:00
Android (Google) Code Review
f32a863262
Merge change 174 into donut
...
* changes:
Improve glgen
2009-04-15 06:14:11 -07:00
Android (Google) Code Review
65943af798
Merge change 175 into donut
...
* changes:
telephony: Don't disable an APN type that is not enabled.
2009-04-14 20:19:42 -07:00
Jack Palevich
ffac1eff58
Improve glgen
...
+ gen script is really a bash script rather than a sh script,
so declare that to be true. (For example, it uses pushd,
which is a part of bash, but not a part of sh. Not sure
how this worked until now. Possibly gen was only run in
environments where /bin/sh was really bash.
+ Check the results of the java compile of the code generator,
and abort the script if the compile fails.
+ Turn on the bash shell option that guards against using
uninitialized variables in the script.
+ Remove the generated class files.
Refactor JniCodeEmitter into two classes: a general-purpose
JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is
to use JniCodeEmitter as a base for emitting static OpenGL ES
bindings.
2009-04-14 19:00:09 -07:00
The Android Open Source Project
23525ac2a3
Merge commit 'korg/cupcake'
2009-04-14 18:18:03 -07:00
Scott Main
5eb4852639
Merge branch 'readonly-p4-donut' into donut
2009-04-14 17:23:06 -07:00
Scott Main
151414fed9
Merge branch 'readonly-p4-donut' into donut
2009-04-14 17:02:10 -07:00
Guang Zhu
1c7ce8787d
Merge branch 'readonly-p4-donut' into donut
2009-04-14 16:47:03 -07:00
Eric Shienbrood
240a001160
Merge branch 'readonly-p4-master'
2009-04-14 15:41:38 -07:00
Mathias Agopian
4cf74ac30a
Merge commit 'goog/master' into merge_master
2009-04-14 15:21:33 -07:00
Mathias Agopian
0a2b2b905f
Merge commit 'goog/master_gl' into merge_master
2009-04-14 14:56:34 -07:00
Mathias Agopian
83d184a299
Merge commit 'goog/master' into merge_master
2009-04-14 14:45:37 -07:00
Android (Google) Code Review
6f6fcc2afa
Merge changes 108,130,131 into donut
...
* changes:
util/DebugUtils: Remove references to android.util.Config
text: Remove references to android.util.Config
Remove references to android.util.Config
2009-04-14 14:40:02 -07:00
Android (Google) Code Review
3cc9a57fe9
Merge change 109 into donut
...
* changes:
Remove references to android.util.Config
2009-04-14 14:39:51 -07:00
Yu Shan Emily Lau
7b624ffa05
Merge branch 'readonly-p4-master'
2009-04-14 14:33:23 -07:00
Android (Google) Code Review
4dc58eb1b7
Merge change 129 into donut
...
* changes:
Clean up trivial Eclipse warnings and fix whitespace.
2009-04-14 14:15:22 -07:00
Android (Google) Code Review
aa913f65ce
Merge change 154 into donut
...
* changes:
gps: Add support for bringing up a GSM data connection on demand for SUPL.
2009-04-14 13:36:33 -07:00
Android (Google) Code Review
609901a028
Merge change 133 into donut
...
* changes:
Initial code for cdma sms encode and decode, in java, with simple tests.
2009-04-14 13:20:43 -07:00
Android (Google) Code Review
8c7acbe3e4
Merge change 132 into donut
...
* changes:
Let's do bug #1769910 actually right.
2009-04-14 13:15:43 -07:00
Android (Google) Code Review
3fcff1d7a4
Merge change 142 into donut
...
* changes:
telephony: Add support for bringing up GSM data connections for GPS SUPL.
2009-04-14 12:52:28 -07:00
Dan Bornstein
a2aef005fc
Merge branch 'readonly-p4-master'
2009-04-14 12:42:22 -07:00
Brett Chabot
7d6daac1a1
Merge branch 'readonly-p4-master'
2009-04-14 12:39:37 -07:00
Lorenzo Colitti
4680ab625f
Merge branch 'readonly-p4-master'
2009-04-14 12:10:26 -07:00
Leon Scroggins
56eccb2855
Merge commit 'goog/master'
2009-04-14 12:06:19 -07:00
Android (Google) Code Review
11b61b471f
Merge change 79
...
* changes:
Squashed commit of the following:
2009-04-14 11:54:14 -07:00
Leon Scroggins
b52d5323ea
Merge branch 'readonly-p4-master'
2009-04-14 11:07:14 -07:00
Ramanan Rajeswaran
34dd8b0422
Merge branch 'readonly-p4-donut' into donut
2009-04-14 11:07:13 -07:00
Ramanan Rajeswaran
f903a0e151
Merge branch 'readonly-p4-donut' into donut
2009-04-14 09:48:58 -07:00
Ramanan Rajeswaran
e86ac7cf26
Merge branch 'readonly-p4-donut' into donut
2009-04-14 09:34:58 -07:00
Jack Palevich
8f75e091d9
Add clarifying comment.
...
(Primarily as a test of the master_gl branch.)
2009-04-13 22:03:39 -07:00
Android (Google) Code Review
519e83f566
Merge change 105 into donut
...
* changes:
Fix crash when mSST is null and change default to GSM.
2009-04-13 21:37:13 -07:00
Jack Palevich
08a305b8f7
Merge commit 'goog/master' into HEAD
2009-04-13 19:52:45 -07:00
Scott Main
06fd85fe11
Merge branch 'readonly-p4-donut' into donut
2009-04-13 18:47:22 -07:00
Robert Greenwalt
7f0548c8ee
Merge branch 'readonly-p4-donut' into donut
2009-04-13 18:36:18 -07:00
Ramanan Rajeswaran
5eabe8272f
Merge branch 'readonly-p4-donut' into donut
2009-04-13 18:16:57 -07:00
Eric Shienbrood
84c73eef74
Merge branch 'readonly-p4-donut' into donut
2009-04-13 18:14:07 -07:00
Yu Shan Emily Lau
beef201149
Merge branch 'readonly-p4-donut' into donut
2009-04-13 17:48:53 -07:00
Dan Bornstein
6414b70404
Merge branch 'readonly-p4-donut' into donut
2009-04-13 17:46:03 -07:00
Jeffrey Sharkey
cdda14a60c
Merge branch 'readonly-p4-master'
2009-04-13 16:58:42 -07:00
Dianne Hackborn
7a8e25ab11
Merge branch 'readonly-p4-master'
2009-04-13 16:55:10 -07:00
Dirk Dougherty
c11ebc3cd3
Merge branch 'readonly-p4-master'
2009-04-13 16:52:33 -07:00
Jack Palevich
6cbca50b6a
Clean up trivial Eclipse warnings and fix whitespace.
...
Added @Override to overridden methods.
Removed unused imports.
Converted tabs to spaces.
Removed \r characters from end-of-lines.
Add .gitignore file to ignore the .class files that are
generated when the "gen" script is run.
2009-04-13 16:40:25 -07:00
Dianne Hackborn
75d2f0da2c
Merge branch 'readonly-p4-master'
2009-04-13 16:13:37 -07:00
Dianne Hackborn
2f6d881687
AI 145994: Integrate #145778 from Donut.
...
Automated import of CL 145994
2009-04-13 16:11:55 -07:00
Yu Shan Emily Lau
a7fa858d50
Merge branch 'readonly-p4-donut' into donut
2009-04-13 16:09:27 -07:00
Dan Bornstein
c5273b8731
Merge branch 'readonly-p4-donut' into donut
2009-04-13 16:06:39 -07:00
Brett Chabot
edf53b615c
Merge branch 'readonly-p4-donut' into donut
2009-04-13 16:03:16 -07:00
Mathias Agopian
efffa67bf9
Merge commit 'goog/master' into master_gl
2009-04-13 14:31:08 -07:00
Android (Google) Code Review
08be29fb3e
Merge change 65 into donut
...
* changes:
Remove references to android.util.Config
2009-04-13 14:13:14 -07:00
Android (Google) Code Review
b3d1c948df
Merge change 64 into donut
...
* changes:
Remove references to android.util.Config
2009-04-13 14:13:00 -07:00
