Ying Wang
90701299aa
am 11872e25: am c47bea9d: Merge "Remove nonexisting module names."
...
* commit '11872e259252ffa45874c8e3ebe38a3c41bbd579':
Remove nonexisting module names.
2013-03-07 18:57:52 -08:00
Ying Wang
c47bea9dd9
Merge "Remove nonexisting module names."
2013-03-08 02:30:48 +00:00
Ying Wang
512b9628b0
Remove nonexisting module names.
...
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
2013-03-07 18:29:56 -08:00
Christopher Ferris
161e0ef974
Merge "Adding TARGET_CPU_VARIANT to config file."
2013-03-08 02:18:08 +00:00
Christopher Ferris
6103fd7ac3
Adding TARGET_CPU_VARIANT to config file.
...
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.
Merge from internal master.
Change-Id: I2b73f9dbdd04cd8ac47035875c714bd0e75920e7
2013-03-07 18:12:50 -08:00
Ying Wang
4781e30a96
resolved conflicts for merge of de949b11
to jb-mr2-dev
...
Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
2013-03-07 18:00:03 -08:00
Justin Ho
d082d6730d
Add fr_CA to l10n builds
...
Bug: 7579865
Change-Id: I92c1368b97ced96cacc560d829707b9b7de69ef4
2013-03-07 12:27:44 -08: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
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
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
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
Dave Langemak
d8eb27bf6a
Add pseudolanguage codes to l10n builds
...
bug: 8299925
Change-Id: Id4bab811bc3f6660f4ce0a21afb689366d80d795
2013-03-01 14:16:29 -08:00
Ying Wang
962d06ef65
Add module names to emulator PRODUCT_PACKAGES.
...
Instead of using "LOCAL_MODULE_TAGS := debug" to install them.
Bug: 8276818
Change-Id: I7eba3c4e6c2f07ebe661522cb0e14afcc3ef7e92
2013-02-28 16:45:41 -08:00
Ken Sumrall
e4a045e9e6
Install a unified fstab for the sdk image
...
Change-Id: I95ed5ee83783dfce110c1f07b187d4624be9a735
2013-02-27 16:20:56 -08:00
Christopher Ferris
310e4b2fcc
Merge "Adding TARGET_CPU_VARIANT to config file."
2013-02-23 01:33:53 +00:00
Christopher Ferris
6d7c03bfc3
Adding TARGET_CPU_VARIANT to config file.
...
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.
Bug: 8005082
Change-Id: I5b945a36c10e0095bccbe453f7652da08ebc6162
2013-02-22 17:24:25 -08:00
Geremy Condra
09d232e977
Revert "Remove ping."
...
This reverts commit 68007028fd
Change-Id: I07ff0d756dff12472633e535c51a29b9062cc3fc
2013-02-22 19:37:38 +00:00
Geremy Condra
68007028fd
Remove ping.
...
This is being done to clear the way for NO_NEW_PRIVS.
Change-Id: I3f642de5c1a1febfe4db39406f3ef15b99482993
2013-02-21 13:43:25 -08:00
Ying Wang
d3aab738de
Use BUILD_PREBUILT to install the cmds.
...
Change-Id: Idd7308d653653387ee3ff4384ee428bc3c663c8b
2013-02-19 16:43:12 -08:00
Dianne Hackborn
1638ffb384
Add new "wm" command.
...
Change-Id: I2415b7696b1d310233a5202b42df5f80f02f4b9f
2013-02-19 12:09:00 -08:00
Doug Zongker
ba25690f00
Merge "factor core.mk product definition"
2013-02-17 15:08:41 +00:00
Ying Wang
0c480c0513
am aa80cac8: am cdacb378: Merge "[MIPS] Use mksh for /system/bin/sh"
...
* commit 'aa80cac8d31ad76111de6f8e718b3e7c27a7d31a':
[MIPS] Use mksh for /system/bin/sh
2013-02-15 15:54:32 -08:00
Doug Zongker
3f9649492b
factor core.mk product definition
...
Split core.mk, which is currently set up for phones and tablets, into
a core.mk and core_minimal.mk, so that non-phone devices can inherit
from core_minimal. The only change to products that inherit from
core.mk is removal of duplicated SELinux packages (which were present
in both core.mk and embedded.mk).
Change-Id: I6787bc42a6495c89ed63df7964512207a930d153
2013-02-15 14:40:12 -08:00
Chris Dearman
1272b7872a
[MIPS] Use mksh for /system/bin/sh
...
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I01a6c1e2ac9de5b6d86c2aace041a0f7400f6b5e
2013-02-15 14:00:18 -08:00
Elliott Hughes
b2bbff7cba
am ea852f6e: am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
...
# Via Android Git Automerger (1) and others
* commit 'ea852f6ed3e9f251eaef4f041fbc0b09229ac924':
Remove more always-true ARCH_ARM_HAVE_ flags.
2013-02-14 17:31:40 -08:00
Elliott Hughes
03d2aa4dd0
Remove more always-true ARCH_ARM_HAVE_ flags.
...
All the remaining flags appear to be actually used.
Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
2013-02-14 12:04:48 -08:00
James Dong
3373e65316
Merge "Build libstagefright_soft_vpxenc.so by default"
2013-02-13 18:18:47 +00:00
Ben Murdoch
bb094c59f1
Merge "Include Chromium resource overlay."
2013-02-12 17:49:37 +00:00
James Dong
471f851141
Build libstagefright_soft_vpxenc.so by default
...
Change-Id: I73a0678446cb392c14cf152c884f94a24a8d8d0d
2013-02-12 09:41:00 -08:00
Dianne Hackborn
1f98681dee
New "Shell" apk is required for all builds.
...
Change-Id: Ica492ea46e0cd23d0d113cd9513e054d8695e130
2013-02-11 15:36:26 -08:00
Ben Murdoch
1d3f06abd0
Include Chromium resource overlay.
...
Resource needed by the Chromium powered WebView are defined in
an overlay in the frameworks/webview project.
See also Ifa00bae10118659c03c049d2a51f350144fe56a7 which adds the
first version of the overlay.
Change-Id: I846334fbb8be865356c566ea22a0090623be0c90
2013-02-08 17:01:26 +00:00
Ying Wang
f05c4f7524
Resurrect generic_armv5
...
But only for unbundled build.
Add it to tapas arch options.
Bug: 8108463
Change-Id: I53cd63c6ab2113fee3992650b561658231ea9921
2013-01-31 11:43:14 -08:00
Wink Saville
554a0adfb7
Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
...
Add voip-common to various files so that its available when booting
and building. Basically everyplace telephony and mms-common where needed
voip-common was added.
In core/pathmap.mk voip is removed as it is no longer in frameworks/base.
Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
2013-01-28 15:30:58 -08:00
Chiao Cheng
44a30c1969
Move Dialer app from core to telephony product target.
...
Bug: 8014407
Change-Id: I76ca58c4cbf05ebbd64131c17075ad4b8a919326
2013-01-17 13:03:19 -08:00
Ying Wang
66dc4c2fb7
resolved conflicts for merge of e016e80c to jb-mr1-dev-plus-aosp
...
Change-Id: Ic1546db5d009307789e0c7fda811982f80655dea
2013-01-10 14:28:56 -08:00
Jean-Baptiste Queru
b81bc6842e
am 7a184cb7: Merge "Change Email2 reference back to Email"
...
* commit '7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d':
Change Email2 reference back to Email
2013-01-08 08:13:50 -08:00
Roger Chen
15df8356ec
Change Email2 reference back to Email
...
Change-Id: Id07d81793d2921be95b30f608cc558312f210c4e
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-01-08 21:48:41 +08:00
Chris Wren
dba068e1ff
am f28aae60: am abc791fc: am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
...
* commit 'f28aae60adb462bba0cfe26ccf9ca80121ca1b7d':
unbundle photo dreams into the GalleryGoogle package
2012-12-03 18:01:14 -08:00
Chris Wren
f28aae60ad
am abc791fc: am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
...
* commit 'abc791fc5723bee48763a67a497ae25ac203b65b':
unbundle photo dreams into the GalleryGoogle package
2012-12-03 17:59:25 -08:00
Chris Wren
abc791fc57
am 801a0792: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
...
* commit '801a079269d78e29c105462518dd4876dd031b2e':
unbundle photo dreams into the GalleryGoogle package
2012-12-03 17:56:51 -08:00
Chris Wren
d2827ae0a8
unbundle photo dreams into the GalleryGoogle package
...
Bug: 7559766
Change-Id: I805ba625b6bfc4378ffabfa1d09edab1930dc913
2012-12-03 11:36:55 -05:00
Jesse Hall
527e6127a6
am 8eb2bad5: am f8728e66: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products"
...
* commit '8eb2bad59852fddbf7cd77ccdb18411691c6c0f1':
Add emulator modules to PRODUCT_PACKAGES in full and sdk products
2012-11-29 10:22:46 -08:00
Jesse Hall
8eb2bad598
am f8728e66: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products"
...
* commit 'f8728e66222a00146ba87e800ccdb776cb9e5156':
Add emulator modules to PRODUCT_PACKAGES in full and sdk products
2012-11-29 10:19:58 -08:00
Jesse Hall
229b137564
Add emulator modules to PRODUCT_PACKAGES in full and sdk products
...
Bug: 7556265
Change-Id: Ie84f5ed6b17cccea7e6181f16686e2aac6955f1a
2012-11-28 11:27:53 -08:00
Keun young Park
b549949569
am 6343d2a3: am 490d3f24: am d4f8d5e6: replace dummy versions with normal ones for mini
...
* commit '6343d2a35620e1a9e1c83dd284735e50cc59c8d9':
replace dummy versions with normal ones for mini
2012-11-27 17:31:26 -08:00
Keun young Park
6343d2a356
am 490d3f24: am d4f8d5e6: replace dummy versions with normal ones for mini
...
* commit '490d3f24fce962c4cb98b1517f0ef1056906d587':
replace dummy versions with normal ones for mini
2012-11-27 11:35:54 -08:00
Keun young Park
490d3f24fc
am d4f8d5e6: replace dummy versions with normal ones for mini
...
* commit 'd4f8d5e64950eb114993a9de975e1519e3509d43':
replace dummy versions with normal ones for mini
2012-11-27 11:31:50 -08:00