Jeff Sharkey
a3557b473e
Merge "Add Terminal app to build."
2013-03-06 21:42:56 +00:00
Ying Wang
2d5bd4a08b
am 246a68c4: am 1df6751d: am b3f5d56f: am 5085447f: Merge "Don\'t install all host modules by default."
...
* commit '246a68c47a8dbbce737ae3e7ca24d39b88e46863':
Don't install all host modules by default.
2013-03-06 20:17:55 +00:00
Ying Wang
246a68c47a
am 1df6751d: am b3f5d56f: am 5085447f: Merge "Don\'t install all host modules by default."
...
* commit '1df6751d494e3219dd5911c70d6696e12a30bcf4':
Don't install all host modules by default.
2013-03-06 20:16:30 +00:00
Ying Wang
1df6751d49
am b3f5d56f: am 5085447f: Merge "Don\'t install all host modules by default."
...
* commit 'b3f5d56f65022ece632134a277c0610355272a04':
Don't install all host modules by default.
2013-03-06 20:13:29 +00:00
Ying Wang
b3f5d56f65
am 5085447f: Merge "Don\'t install all host modules by default."
...
* commit '5085447f7f4c71e61c24f9d26df1e48a7a9d03ca':
Don't install all host modules by default.
2013-03-06 12:11:16 -08:00
Jeff Sharkey
46ca36a015
Add Terminal app to build.
...
Change-Id: Iec08640c5606907e00276694ccfadc654224c4c2
2013-03-06 11:52:30 -08:00
Ying Wang
5085447f7f
Merge "Don't install all host modules by default."
2013-03-06 19:48:39 +00:00
Ying Wang
2e65cd5510
Don't install all host modules by default.
...
Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.
Change-Id: Ic26319c26c1166bc1062dfbcfb4e006af185249a
2013-03-06 11:47:36 -08:00
keunyoung
bb7bbd97f8
am 7475afa6: am 42e05e04: Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev
...
* commit '7475afa6991a93f66c45e98e11c408c601a48b7b':
remove reference of emulator vold.fstab which is no longer necessary
2013-03-06 16:49:54 +00:00
keunyoung
7475afa699
am 42e05e04: Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev
...
* commit '42e05e040e18367a4597564533c1af5642ebf79c':
remove reference of emulator vold.fstab which is no longer necessary
2013-03-06 16:47:43 +00:00
keunyoung
42e05e040e
Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev
2013-03-06 02:05:56 +00:00
keunyoung
d6e63b3ab5
remove reference of emulator vold.fstab which is no longer necessary
...
Change-Id: I2c8d28060e8204ecbe255cb1e2752e3030dc2d99
2013-03-05 17:44:10 -08:00
keunyoung
d281f1aa30
am a67b5aee: am c3eb68c4: pull goldfish specific stuffs from emulator.mk
...
* commit 'a67b5aeeb84d4fb368eea4e939cd5ecad1b12760':
pull goldfish specific stuffs from emulator.mk
2013-03-06 00:40:08 +00:00
keunyoung
a67b5aeeb8
am c3eb68c4: pull goldfish specific stuffs from emulator.mk
...
* commit 'c3eb68c4ba383e7de2dd9b761d96dbe646586845':
pull goldfish specific stuffs from emulator.mk
2013-03-06 00:37:29 +00:00
keunyoung
c3eb68c4ba
pull goldfish specific stuffs from emulator.mk
...
- init.goldfish.rc, init.goldfish.sh, and ueventd.goldfish.rc
Change-Id: Ia4a12477faf727c4e2276313d6d9dcf7ea430b22
2013-03-05 14:19:09 -08:00
Torne (Richard Coles)
9731392d43
am dce8cc7d: am aace2024: Support build rules which generate .o files.
...
* commit 'dce8cc7dd5e5f83d97668a4afb13908c9983b982':
Support build rules which generate .o files.
2013-03-05 21:08:09 +00:00
Torne (Richard Coles)
dce8cc7dd5
am aace2024: Support build rules which generate .o files.
...
* commit 'aace2024d723f6914f05bd9d847166c45447a913':
Support build rules which generate .o files.
2013-03-05 21:04:53 +00:00
Dianne Hackborn
8776828142
Merge "Welcome, Key Lime Pie."
2013-03-05 19:51:23 +00:00
Dianne Hackborn
a6e7f28492
Welcome, Key Lime Pie.
...
Change-Id: I51563ed3622d61a6396246c78b01605ff7a96b02
2013-03-05 10:29:24 -08:00
The Android Open Source Project
216dd68a6c
am 1565e24a: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '1565e24a089290994afb23682e8fcaf436043e35':
JWQ64
2013-03-05 15:58:52 +00:00
The Android Open Source Project
1565e24a08
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I82507a8e1b352999d9e886071ed0297ca637b3b1
2013-03-05 07:53:09 -08:00
The Android Automerger
9b3a95ea52
JWQ64
2013-03-05 05:56:56 -08:00
The Android Automerger
5591f51ce6
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-05 05:55:17 -08:00
Torne (Richard Coles)
aace2024d7
Support build rules which generate .o files.
...
webviewchromium has some build rules which use a custom tool to create
.o files from other input (i.e. they are not prebuilt and so can't be
included in LOCAL_PREBUILT_OBJ_FILES). Support adding .o files to
LOCAL_GENERATED_SOURCES and doing the right thing with them (including
them in the static/dynamic library or executable being built).
Bug: 7714333
Change-Id: I3b1d29eeff30aebeafe33398f9bef2eb6972d997
2013-03-05 10:35:57 +00:00
Ying Wang
3475e97957
am 9a427c88: am eabb34fb: Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev
...
* commit '9a427c88cf1b26bfc7701dcbb3d708732f70b1e5':
Move emulator.mk out of full_base.mk
2013-03-05 07:13:47 +00:00
Ying Wang
9a427c88cf
am eabb34fb: Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev
...
* commit 'eabb34fb90712938449573962618f36c6df51e7c':
Move emulator.mk out of full_base.mk
2013-03-05 07:11:28 +00:00
Ying Wang
eabb34fb90
Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev
2013-03-05 07:09:37 +00:00
Ying Wang
e8f5406582
Move emulator.mk out of full_base.mk
...
Instead we should have the emulator products (full, full_mips, full_x86,
sdk) inherit from emulator.mk directly, because full_base.mk is also
inherited by real device products, such as full_manta.mk.
Change-Id: I475f7262eaa65dd85fc844ed357547c76c82598f
2013-03-04 23:08:01 -08:00
Ying Wang
83c23e69d8
Move emulator.mk out of full_base.mk
...
Instead we should have the emulator products (full, full_mips, full_x86,
sdk) inherit from emulator.mk directly, because full_base.mk is also
inherited by real device products, such as full_manta.mk.
Change-Id: I6f5f9255c73be8a4cfad7ddf88c4b633b05a7091
2013-03-04 22:55:22 -08:00
Ken Sumrall
d4c6ff727d
am 6d12cbc5: am d5198cbc: Merge "Install a unified fstab in the emulator image" into jb-mr2-dev
...
* commit '6d12cbc5bc8df4a86da262564a59985da97b9741':
Install a unified fstab in the emulator image
2013-03-05 03:19:02 +00:00
Ken Sumrall
6d12cbc5bc
am d5198cbc: Merge "Install a unified fstab in the emulator image" into jb-mr2-dev
...
* commit 'd5198cbccecfca083cc5df39e7fb3c0a64211e63':
Install a unified fstab in the emulator image
2013-03-05 03:17:39 +00:00
Ken Sumrall
d5198cbcce
Merge "Install a unified fstab in the emulator image" into jb-mr2-dev
2013-03-05 03:14:27 +00:00
Ken Sumrall
f151d3718b
Install a unified fstab in the emulator image
...
Also, modify the sdk.mk file to undo an earlier change
to add the unified fstab there, and move the include
of the emulator.mk file to after PRODUCT_COPY_FILES
is initially defined.
Change-Id: I7318ebefa1b3043f32e99a9e278fe4667f760aa8
2013-03-04 18:30:52 -08:00
The Android Open Source Project
535ebd01bf
am dd66f462: (-s ours) am 69bb4e42: am 564c2b3e: Reconcile with jb-mr1.1-release - do not merge
...
* commit 'dd66f462fd65d3f4caccf3b54b1e3efd548feaf6':
JDQ39B
2013-03-05 01:02:38 +00:00
The Android Open Source Project
dd66f462fd
am 69bb4e42: am 564c2b3e: Reconcile with jb-mr1.1-release - do not merge
...
* commit '69bb4e42c58780b6b98cf8a20cac548474dfb6f9':
JDQ39B
2013-03-05 01:00:03 +00:00
The Android Open Source Project
69bb4e42c5
am 564c2b3e: Reconcile with jb-mr1.1-release - do not merge
...
* commit '564c2b3e4da71cfe4f1a0c8e15e2c9cec2415eea':
JDQ39B
2013-03-05 00:56:08 +00:00
The Android Open Source Project
564c2b3e4d
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Ic2017881546bd6488432b9a87196f1c8eb6e5819
2013-03-04 11:14:54 -08:00
The Android Open Source Project
f08e8eb2a3
am 0729ec54: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '0729ec54cdc856990366b401a117daec11c2dc97':
JWQ63
JWQ59D
JWQ59C
JWQ59B
JWQ59
JWQ58
JWQ57
JWQ56C
JWQ56B
JWQ56
JWQ52D
JWQ52C
JWQ52B
JWQ52
JWQ51C
JWQ51B
2013-03-04 19:10:08 +00:00
The Android Automerger
1c2fa25b71
JDQ39B
2013-03-04 11:08:59 -08:00
The Android Open Source Project
0729ec54cd
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0b8102a3962010378a8e19955a38c9cc44bd1c95
2013-03-04 11:06:28 -08:00
The Android Automerger
349a249913
JWQ63
2013-03-04 05:57:17 -08:00
The Android Automerger
03b32d3acb
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-04 05:55:11 -08:00
Ying Wang
4f0d4e9183
am 0410d3ef: Merge "Allow to call dist-for-goals multiple times for the same file" into jb-mr2-dev
...
* commit '0410d3ef3d9578177bffb06a657b1addab605167':
Allow to call dist-for-goals multiple times for the same file
2013-03-02 01:47:42 +00:00
Ying Wang
0410d3ef3d
Merge "Allow to call dist-for-goals multiple times for the same file" into jb-mr2-dev
2013-03-02 01:43:28 +00:00
Ying Wang
534fcd766e
Allow to call dist-for-goals multiple times for the same file
...
You can dist the same file for multiple goals in multiple calls to
dist-for-goals. The first call will establish the real copy rule, while
the rest call just establishes the goals' dependency on the dest file.
This enable uss to remove the bizarre $(if ..) enclosing the droid and
sdk dist while avoiding make's multiple rules warning.
Change-Id: I76475db76a9e6167e0e606dd582b54e80dfcdd22
2013-03-01 16:51:26 -08:00
Dave Langemak
f95fc3d0d9
am d8eb27bf: Add pseudolanguage codes to l10n builds bug: 8299925
...
* commit 'd8eb27bf6a532bf6cd1343c288a34845a1c13e0a':
Add pseudolanguage codes to l10n builds bug: 8299925
2013-03-02 00:25:59 +00:00
The Android Automerger
ef11e5f3e3
JWQ59D
2013-03-01 16:14:42 -08:00
Dave Langemak
d8eb27bf6a
Add pseudolanguage codes to l10n builds
...
bug: 8299925
Change-Id: Id4bab811bc3f6660f4ce0a21afb689366d80d795
2013-03-01 14:16:29 -08:00
The Android Automerger
4cca3b597e
JWQ59C
2013-03-01 11:33:21 -08:00
The Android Automerger
232edaa461
JWQ59B
2013-02-28 15:26:56 -08:00