OSDN Git Service
Robert Greenwalt [Fri, 27 Apr 2012 19:51:24 +0000 (12:51 -0700)]
am
f598c6f8: Merge "Add Development/scripts to path." into jb-dev
* commit '
f598c6f8cd46a1a5ff188ce51ba5b8941916526e':
Add Development/scripts to path.
Robert Greenwalt [Fri, 27 Apr 2012 18:55:06 +0000 (11:55 -0700)]
Merge "Add Development/scripts to path." into jb-dev
Robert Greenwalt [Fri, 27 Apr 2012 17:02:37 +0000 (10:02 -0700)]
Add Development/scripts to path.
Adding a script to there and people thought it would be nice if it were
available/in seach path.
bug:
4208971
Change-Id: I58475f5f0149cec2485dc5bc787b5fb3cc68ba0a
Andrew Hsieh [Fri, 27 Apr 2012 16:35:19 +0000 (00:35 +0800)]
Added BUILD_HOST_static to build statically linked executable/shared-lib
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.
In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread
Change-Id: I8fa91a937b728ccdf942c4ba199efb1e2e49da3d
Colin Cross [Fri, 27 Apr 2012 00:04:54 +0000 (17:04 -0700)]
Use split-long-arguments to touch pdk platform.zip files
touch $(_pdk_fusion_files) is too long for some systems, use
split-long-arguments to execute touch multiple times with a
subset of the list of files.
Change-Id: I8e8c6770936337b93e0fdf381eca8c79fd722523
Ying Wang [Thu, 26 Apr 2012 19:26:33 +0000 (12:26 -0700)]
Option to keep the generated R class in static Java libarry
Bug:
6404748
Set LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY to true to do that.
Change-Id: Ieee3cae431e3b1484ec598312729f2c871db2315
Nick Kralevich [Thu, 26 Apr 2012 18:38:51 +0000 (11:38 -0700)]
Merge "ARM: compile everything with relro / bind_now." into jb-dev
Nick Kralevich [Thu, 26 Apr 2012 16:09:24 +0000 (09:09 -0700)]
ARM: compile everything with relro / bind_now.
Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.
See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html
Stop using the custom linker script, which inhibits
relro / bind_now support.
Change-Id: Ie97ccdd2845886bbc2ba2fdd47eed0ff4b29b60b
James Dong [Thu, 26 Apr 2012 01:09:34 +0000 (18:09 -0700)]
Build libstagefright_soft_mpeg4enc.so by default
o related-to-bug:
6401068
Change-Id: I3114d4b817acc85a6982d03ef3b161141413a079
James Dong [Wed, 25 Apr 2012 01:02:49 +0000 (18:02 -0700)]
Merge "Build libstagefright_soft_h264enc by default"
Ying Wang [Wed, 25 Apr 2012 00:12:43 +0000 (17:12 -0700)]
Fix pdk build.
The pdk builds don't have access to development.
Change-Id: Ie7e9f8d24b788749481465311e64145e175b8c4f
Raphael Moll [Tue, 24 Apr 2012 22:43:28 +0000 (15:43 -0700)]
resolved conflicts for merge of
4a6e8b95 to master
Change-Id: I04abdad12266d7f0eb248528d9bbd35369d18413
The Android Open Source Project [Tue, 24 Apr 2012 22:19:29 +0000 (15:19 -0700)]
am
30a6d7e3: am
76f57fe3: Reconcile with ics-mr1-release
* commit '
30a6d7e3e5904c2e0a833a2adef83db6cd54e9ba':
IMM76K
IMM76J
IMM76I
IMM76H
IMM76G
IMM76F
IMM76E
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:54:15 +0000 (14:54 -0700)]
am
80879a6e: (-s ours) am
695a2b3f: am
9b16b129: Merge "Switch to new locations of toolchains"
* commit '
80879a6ea4be133c222911055d83e3e43dc15be5':
Switch to new locations of toolchains
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:47:45 +0000 (14:47 -0700)]
Merge
8664008c to master
Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:31:31 +0000 (14:31 -0700)]
am
77df1f2a: am
9987dbbb: am
d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
* commit '
77df1f2aeceaeabfc058a1938b672fe02a4fed93':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:31:25 +0000 (14:31 -0700)]
am
7ed999aa: (-s ours) am
c4aa4ff3: am
810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '
7ed999aaf00a71d99975a4a068ba2562c0aabc88':
Fix build problems with gcc-4.6.x.
Scott Main [Tue, 24 Apr 2012 21:27:31 +0000 (14:27 -0700)]
am
4054a158: am
7a086316: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
4054a1587a878d2c5f9dc64433bf7ae8ebbe6bd3':
Scott Main [Tue, 24 Apr 2012 21:27:30 +0000 (14:27 -0700)]
am
217a4d89: am
9041aa50: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
217a4d896b9bd5bd91cccc8077f7ebd353538f7b':
James Dong [Tue, 24 Apr 2012 01:02:34 +0000 (18:02 -0700)]
Build libstagefright_soft_h264enc by default
related-to-bug:
6383440
Change-Id: I852941c72f9b7270ac6e5b094e4b2a0322643ac8
Scott Main [Tue, 24 Apr 2012 20:58:00 +0000 (13:58 -0700)]
am
f689b77c: am
b3d8eecd: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
f689b77c0519f1c73006d55d8ca3ed35bfb64ad1':
Scott Main [Tue, 24 Apr 2012 20:57:59 +0000 (13:57 -0700)]
am
7291a4f7: am
27e53840: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
7291a4f78408651d78a8ff05eda22ce3805603dd':
Ying Wang [Tue, 24 Apr 2012 20:29:05 +0000 (13:29 -0700)]
Merge "Make export_includes depend on the module's definition makefile."
Colin Cross [Tue, 24 Apr 2012 19:45:47 +0000 (12:45 -0700)]
Merge "Set timestamps of files from platform.zip to current time"
Colin Cross [Tue, 24 Apr 2012 01:49:04 +0000 (18:49 -0700)]
Set timestamps of files from platform.zip to current time
Touch files unzipped from platform.zip to update their timestamp.
Prevents make dependency confusion from files with old times.
Also add a dependency for the implicit copy rule on the
pdk_fusion.stamp file to force make to use the updated
files.
Change-Id: Ia54454518d229ce3670023819836f586fef65d3f
Jean-Baptiste Queru [Tue, 24 Apr 2012 17:37:30 +0000 (10:37 -0700)]
Merge "On linux, always use the prebuilt host toolchain"
Ying Wang [Tue, 24 Apr 2012 04:29:18 +0000 (21:29 -0700)]
Make export_includes depend on the module's definition makefile.
Bug:
6383397
Note that LOCAL_MODULE_MAKEFILE is calculated in the macro my-dir,
which must be called at the beginning of your Android.mk to calculate
LOCAL_PATH.
Change-Id: I7aa079e37253fbda25ffb85c2e5bbf0663340e27
Jean-Baptiste Queru [Tue, 24 Apr 2012 01:27:18 +0000 (18:27 -0700)]
Whitelist audience
Change-Id: I3a39f4bdc5c52e01b7d5d187e35b6fbf770756e2
Raphael Moll [Mon, 23 Apr 2012 22:47:39 +0000 (15:47 -0700)]
am
c094c0a6: am
d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit '
c094c0a68fe311ea671b4c95756d300bc6a540f4':
Split target/product/sdk.mk into sdk.git
Raphael Moll [Mon, 23 Apr 2012 22:43:35 +0000 (15:43 -0700)]
am
d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit '
d0831659af544b93f3a9592a1cd4f85ff89e8635':
Split target/product/sdk.mk into sdk.git
The Android Open Source Project [Mon, 23 Apr 2012 21:42:27 +0000 (14:42 -0700)]
am
76f57fe3: Reconcile with ics-mr1-release
* commit '
76f57fe3737a5f88c536f3fe936f2343bbe3b1f3':
IMM76K
IMM76J
IMM76I
IMM76H
IMM76G
IMM76F
IMM76E
The Android Open Source Project [Mon, 23 Apr 2012 21:40:15 +0000 (14:40 -0700)]
Reconcile with ics-mr1-release
Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902
Raphael Moll [Mon, 23 Apr 2012 19:44:00 +0000 (12:44 -0700)]
Merge "Split target/product/sdk.mk into sdk.git"
Jean-Baptiste Queru [Mon, 23 Apr 2012 16:25:59 +0000 (09:25 -0700)]
am
695a2b3f: am
9b16b129: Merge "Switch to new locations of toolchains"
* commit '
695a2b3fd9b68f45b6fa1065c1254f88318dd4ca':
Switch to new locations of toolchains
Jean-Baptiste Queru [Mon, 23 Apr 2012 16:23:58 +0000 (09:23 -0700)]
am
9b16b129: Merge "Switch to new locations of toolchains"
* commit '
9b16b1293255be054a84e6f39098c7a35357f636':
Switch to new locations of toolchains
Jean-Baptiste Queru [Mon, 23 Apr 2012 15:31:53 +0000 (08:31 -0700)]
Merge "Switch to new locations of toolchains"
Andrew Hsieh [Sat, 21 Apr 2012 07:54:42 +0000 (00:54 -0700)]
am
acd812d6: am
11e0192d: Merge "Add goldfish audio hw to board/generic_x86"
* commit '
acd812d6a7bce9fd44e2b5974b93c542754f78d6':
Add goldfish audio hw to board/generic_x86
Andrew Hsieh [Sat, 21 Apr 2012 07:52:28 +0000 (00:52 -0700)]
am
11e0192d: Merge "Add goldfish audio hw to board/generic_x86"
* commit '
11e0192d29459aab8f3acebaae113eece492069f':
Add goldfish audio hw to board/generic_x86
Jean-Baptiste Queru [Sat, 21 Apr 2012 02:04:56 +0000 (19:04 -0700)]
On linux, always use the prebuilt host toolchain
Change-Id: I8077c4780e1e3540e5e2133cf0ffa61d474d3acc
Andrew Hsieh [Fri, 20 Apr 2012 23:52:26 +0000 (16:52 -0700)]
Merge "Add goldfish audio hw to board/generic_x86"
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:45:51 +0000 (16:45 -0700)]
am
9987dbbb: am
d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
* commit '
9987dbbbb43ca3279ec615299fbab8a9101aa51c':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:45:49 +0000 (16:45 -0700)]
am
c4aa4ff3: am
810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '
c4aa4ff3551873c2e87a8679994d1f41f9909b0b':
Fix build problems with gcc-4.6.x.
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:43:25 +0000 (16:43 -0700)]
am
d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
* commit '
d0427e493edf2e4de2bd60fd1cc8253e9de233fd':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:43:23 +0000 (16:43 -0700)]
am
810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '
810b0d8bb4a458c5a92c0bed48b75cbf27f1410d':
Fix build problems with gcc-4.6.x.
Keun young Park [Thu, 19 Apr 2012 22:36:18 +0000 (15:36 -0700)]
enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build
Bug:
6352960
Change-Id: I4a26bf26a51b95fb97c8b2adc9d32a543832c708
Keun young Park [Fri, 20 Apr 2012 23:20:42 +0000 (16:20 -0700)]
Merge "Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK""
The Android Automerger [Fri, 20 Apr 2012 23:20:26 +0000 (16:20 -0700)]
IMM76K
Keun young Park [Fri, 20 Apr 2012 23:18:34 +0000 (16:18 -0700)]
Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"
This reverts commit
9283168e61a4991d39a6c599627eefc45d41c099
Jean-Baptiste Queru [Fri, 20 Apr 2012 23:15:42 +0000 (16:15 -0700)]
Switch to new locations of toolchains
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
Colin Cross [Fri, 20 Apr 2012 22:44:29 +0000 (15:44 -0700)]
Merge "Move pdk fusion platform.zip file under vendor/pdk"
Raphael Moll [Fri, 20 Apr 2012 20:43:42 +0000 (13:43 -0700)]
Split target/product/sdk.mk into sdk.git
This changes target/product/sdk.mk so that the list of tools
and libs to build for the SDK be actually defined in both
sdk.git and development.git.
Depends on dev.git change I6bbc6644a and sdk.git change Id270eba6
Change-Id: I790df85ea8620f73c769aec0f92f474de60b63f9
Keun young Park [Fri, 20 Apr 2012 19:02:34 +0000 (12:02 -0700)]
Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"
Scott Main [Fri, 20 Apr 2012 17:38:51 +0000 (10:38 -0700)]
am
ac2c989e: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
ac2c989e8492a733bdd3d4c7e1bedd5210c56c8d':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Scott Main [Fri, 20 Apr 2012 17:38:15 +0000 (10:38 -0700)]
am
7a086316: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
7a086316424925fb33ed470116563712e7754f8b':
Scott Main [Fri, 20 Apr 2012 17:37:32 +0000 (10:37 -0700)]
am
9041aa50: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
9041aa50fbdb2cff512617a0377385c7d5ada663':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Scott Main [Fri, 20 Apr 2012 17:35:33 +0000 (10:35 -0700)]
am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Scott Main [Fri, 20 Apr 2012 17:35:12 +0000 (10:35 -0700)]
am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Scott Main [Fri, 20 Apr 2012 17:35:11 +0000 (10:35 -0700)]
am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Scott Main [Fri, 20 Apr 2012 17:19:54 +0000 (10:19 -0700)]
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
Change-Id: I0125b1d585a0adde7f5f485f3288fdc7a8a55faf
Keun young Park [Thu, 19 Apr 2012 22:36:18 +0000 (15:36 -0700)]
enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build
- uses prebuilt tools for PDK
Bug:
6352960
Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d
Jean-Baptiste Queru [Fri, 20 Apr 2012 15:30:20 +0000 (08:30 -0700)]
Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
Jean-Baptiste Queru [Fri, 20 Apr 2012 15:30:04 +0000 (08:30 -0700)]
Merge "Fix build problems with gcc-4.6.x."
Jing Yu [Fri, 18 Nov 2011 22:13:15 +0000 (14:13 -0800)]
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html
-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.
This patch does not affect gcc-4.4.3 build.
Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
Doug Kwan [Thu, 13 Oct 2011 19:28:34 +0000 (12:28 -0700)]
Fix build problems with gcc-4.6.x.
Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
Andrew Hsieh [Fri, 20 Apr 2012 08:08:14 +0000 (16:08 +0800)]
Add goldfish audio hw to board/generic_x86
Without it, app with audio may crash x86 emulator
Change-Id: Ie9b30a2827c0a559e7cf73b7b21604f36c379483
Scott Main [Fri, 20 Apr 2012 02:31:16 +0000 (19:31 -0700)]
am
b3d8eecd: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
b3d8eecd9ca47ac369ce420b6da21947a6a6d84f':
Scott Main [Fri, 20 Apr 2012 02:30:33 +0000 (19:30 -0700)]
am
1882adfd: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
1882adfd49b392acb6efe66a09bf753e1c830eef':
docs: update doc template to make the Resources side nav wider (+40px)
Scott Main [Fri, 20 Apr 2012 02:29:49 +0000 (19:29 -0700)]
am
27e53840: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
27e538405495b3d36b2750e376706e0ad583a03c':
docs: update doc template to make the Resources side nav wider (+40px)
Scott Main [Fri, 20 Apr 2012 02:28:10 +0000 (19:28 -0700)]
am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
Scott Main [Fri, 20 Apr 2012 02:27:59 +0000 (19:27 -0700)]
am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
Scott Main [Fri, 20 Apr 2012 02:27:39 +0000 (19:27 -0700)]
am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
Scott Main [Fri, 20 Apr 2012 02:23:04 +0000 (19:23 -0700)]
docs: update doc template to make the Resources side nav wider (+40px)
Change-Id: I173e64d57f9ec31bf0c3912bca5d46a5f7c78338
Colin Cross [Fri, 20 Apr 2012 00:15:44 +0000 (17:15 -0700)]
Merge changes I9a390206,If3e9e846
* changes:
build: separate dist tools and ota tools
build: remove unused ota tools
Jean-Baptiste Queru [Thu, 19 Apr 2012 22:06:10 +0000 (15:06 -0700)]
Merge "Use an https URL"
Jean-Baptiste Queru [Thu, 19 Apr 2012 21:53:27 +0000 (14:53 -0700)]
Use an https URL
Change-Id: I9842d009b852df1882eaddb1bd53b216da0f4650
Iliyan Malchev [Tue, 10 Apr 2012 22:09:11 +0000 (15:09 -0700)]
vbox_x86: add a 256M ext4 cache partition
Change-Id: If88895f60308673526a579a96d5b1ed9206c0241
Signed-off-by: Iliyan Malchev <malchev@google.com>
Colin Cross [Thu, 19 Apr 2012 20:54:39 +0000 (13:54 -0700)]
build: separate dist tools and ota tools
aapt is not needed for a dist build and not available in a pdk dist
build. Create a new list DISTTOOLS that dist builds depends on,
and change OTATOOLS to be DISTTOOLS plus aapt, which is build by
make otatools.
Change-Id: I9a39020640b0e2cade8073aa14ee2ada9a20d78b
Colin Cross [Thu, 19 Apr 2012 20:26:00 +0000 (13:26 -0700)]
build: remove unused ota tools
genext2fs, tune2fs, and e2fsck are no longer used by mkuserimg.sh.
Change-Id: If3e9e846e021de0973bde2702e60acdc9f4c57c7
The Android Automerger [Thu, 19 Apr 2012 19:15:03 +0000 (12:15 -0700)]
IMM76J
Keun young Park [Thu, 19 Apr 2012 17:25:20 +0000 (10:25 -0700)]
Merge "enable recovery img build for PDK"
Keun young Park [Thu, 19 Apr 2012 16:55:24 +0000 (09:55 -0700)]
enable recovery img build for PDK
Bug:
6363041
Change-Id: I25dff887dd0946c9506926e66e0514390c20692e
Colin Cross [Thu, 19 Apr 2012 07:50:00 +0000 (00:50 -0700)]
Move pdk fusion platform.zip file under vendor/pdk
Look for the platform.zip file in:
vendor/pdk/DEVICE/PRODUCT-BUILD_VARIANT/platform/platform.zip
Change-Id: I275029842fdf13867d5141549ca8c39abb23600b
Ying Wang [Thu, 19 Apr 2012 00:35:55 +0000 (17:35 -0700)]
Write out export_includes whenever the module is built.
Bug:
6362268
Change-Id: If872cf8fe597a02e6ca740a181cea85f486df98e
Ying Wang [Wed, 18 Apr 2012 23:55:27 +0000 (16:55 -0700)]
Merge "Revert "Write out export_includes whenever the module is built.""
Ying Wang [Wed, 18 Apr 2012 23:55:07 +0000 (16:55 -0700)]
Revert "Write out export_includes whenever the module is built."
This reverts commit
40c34f3778e778762c7a7dcaf8697b2c90a717de
Ying Wang [Wed, 18 Apr 2012 23:38:00 +0000 (16:38 -0700)]
Merge "Write out export_includes whenever the module is built."
Ying Wang [Wed, 18 Apr 2012 23:30:17 +0000 (16:30 -0700)]
Write out export_includes whenever the module is built.
Bug:
6362268
Change-Id: Ic5d028c108423c694736a06c05ec13093d42f1b8
Brett Chabot [Wed, 18 Apr 2012 21:56:18 +0000 (14:56 -0700)]
Merge "Add smoke tests to sdk build."
Ying Wang [Wed, 18 Apr 2012 01:10:11 +0000 (18:10 -0700)]
Add back ARM_EABI_TOOLCHAIN.
ARM_EABI_TOOLCHAIN is still used by the kernel build.
Change-Id: I5cdad0b478c0836e06a2af567e4e212602da1f3b
Mike Lockwood [Tue, 17 Apr 2012 17:40:04 +0000 (10:40 -0700)]
Merge "core.mk: Add rule for init.usb.rc"
David 'Digit' Turner [Tue, 17 Apr 2012 12:50:47 +0000 (14:50 +0200)]
resolved conflicts for merge of
296e4828 to master
Change-Id: Iae41a458f1eed497119c3abe4bf27194821c075d
David Turner [Tue, 17 Apr 2012 11:51:52 +0000 (04:51 -0700)]
am
81d54025: am
f04ee373: Merge "Update gdbclient for x86 target"
* commit '
81d54025c75793c9f8cb2290c81b4075f9274be1':
Update gdbclient for x86 target
David Turner [Tue, 17 Apr 2012 11:49:17 +0000 (04:49 -0700)]
am
f04ee373: Merge "Update gdbclient for x86 target"
* commit '
f04ee373123fab58dfd3adc06966cfe127abf6a6':
Update gdbclient for x86 target
David Turner [Tue, 17 Apr 2012 09:27:48 +0000 (02:27 -0700)]
Merge "Update gdbclient for x86 target"
Brett Chabot [Tue, 17 Apr 2012 01:29:48 +0000 (18:29 -0700)]
Add smoke tests to sdk build.
Change-Id: If614ad21b3323e16b358f248c44c15b0fe5f0e9a
Andrew Flynn [Mon, 16 Apr 2012 17:25:27 +0000 (10:25 -0700)]
Merge "Default ro.carrier to unknown"
Andrew Flynn [Fri, 13 Apr 2012 15:53:44 +0000 (08:53 -0700)]
Default ro.carrier to unknown
This was previously performed by init.c
Change-Id: Id34c636e06dfe2766446f909e9d05557163d812d
Eric Laurent [Sat, 14 Apr 2012 15:49:33 +0000 (08:49 -0700)]
Merge "Fix problem with audio policy configuration file."
Eric Laurent [Sat, 14 Apr 2012 01:58:20 +0000 (18:58 -0700)]
Fix problem with audio policy configuration file.
Having the copy of default audio_policy.conf file in generic_no_telephony.mk
doesn't work because of multiple inheritance on certain products.
Move it to board/generic/device.mk to be consistent with how the audio HAL
modules are managed.
Issue
6333980.
Change-Id: If6053ad596b6f693f43c72ba9cc54cb7a7cfa233
The Android Automerger [Fri, 13 Apr 2012 21:20:51 +0000 (14:20 -0700)]
IMM76I