Commit Graph

2598 Commits

Author SHA1 Message Date
Elliott Hughes
559ffeb2ef am 8e67348b: Merge "Track libnativehelper move for PDK." into jb-dev
* commit '8e67348b515636ec8314da44b3f583c5d053e81a':
  Track libnativehelper move for PDK.
2012-05-04 16:50:41 -07:00
Elliott Hughes
89898dff4e Track libnativehelper move for PDK.
Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
2012-05-04 15:36:42 -07:00
Shih-wei Liao
eaa0f82295 Merge "Members in LOCAL_WHOLE_STATIC_LIBRARIES should be force_loaded." 2012-05-03 15:40:27 -07:00
Shih-wei Liao
b2680757a0 Members in LOCAL_WHOLE_STATIC_LIBRARIES should be force_loaded.
For Mac build, force_load the LOCAL_WHOLE_STATIC_LIBRARIES.

Mac has its custom linker. However, its linking rule for generating
shared libraries doesn’t take the LOCAL_WHOLE_STATIC_LIBRARIES
into consideration.

Change-Id: Ia6858bf6e2ebb334db8f3d0bdc71d7ecc0ef11c1
2012-05-03 15:38:17 -07:00
Jean-Baptiste Queru
e11abdbe57 am 76cc34ca: am 6dfbf024: am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
* commit '76cc34ca0adefac91f90fae478f2c6140e41e088':
  TARGET_linux-arm.mk: use single slash version of -print-whatever
2012-05-02 17:07:09 -07:00
Jean-Baptiste Queru
76cc34ca0a am 6dfbf024: am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
* commit '6dfbf0240b77acaf7d6b650b4c206deb29337e7b':
  TARGET_linux-arm.mk: use single slash version of -print-whatever
2012-05-02 17:05:04 -07:00
Jean-Baptiste Queru
cd742a991e am 9bdc2907: am 8571ee47: am f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"
* commit '9bdc290792f8c5c4e4beb40e6b7f335759b6d6d5':
  Force use of compatibility compilers on Apple's command line tools
2012-05-02 14:21:06 -07:00
Jean-Baptiste Queru
9bdc290792 am 8571ee47: am f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"
* commit '8571ee478ee352827ec37460d23e6e0dbb1e96db':
  Force use of compatibility compilers on Apple's command line tools
2012-05-02 14:18:28 -07:00
Jean-Baptiste Queru
9e4e3b378f Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever" 2012-05-02 13:26:50 -07:00
Al Sutton
0d07c732c7 Force use of compatibility compilers on Apple's command line tools
The cc and c++ compilers included in Apple's command line tools show some
unusual behaviour which causes the build to fail in several projects under
Xcode 4.3

This patch uses the gnu compatibility gcc and g++ compilers on OS X instead
to reduce problems, and generates an error when an llvm based compiler is
detected because they currently do not generate usable emulator executables
due to them not honouring global register variables.

Change-Id: I506c22dad3dcbd41df3c7672802a675d3655e262
Signed-off-by: Al Sutton <al@funkyandroid.com>
2012-05-02 07:11:27 -07:00
Jean-Baptiste Queru
48cf73bd13 Restore AOSP-style version numbers - do not merge
Change-Id: I70e3568a78feed4ff69bcdbf4fe2bd13f5211b4c
2012-05-01 08:48:04 -07:00
Ying Wang
3072491bb3 am 000e89a5: Strengthen dependencies on LOCAL_REQUIRED_MODULES
* commit '000e89a5b95a1d3071277ff279263204f49cbd78':
  Strengthen dependencies on LOCAL_REQUIRED_MODULES
2012-04-30 16:37:11 -07:00
Ying Wang
65a086bbe2 Merge "Strengthen dependencies on LOCAL_REQUIRED_MODULES" 2012-04-30 16:34:17 -07:00
Ying Wang
000e89a5b9 Strengthen dependencies on LOCAL_REQUIRED_MODULES
Bug: 6418863
This change expands the PRODUCT_PACKAGES with the required modules.
Before this change, since the required modules are not in the
PRODUCT_PACKAGES, they are not directly depended on by the image files.
If the dependent is not to be included in the image but the required
modules are to be included, the dependency of the image on the required
modules gets lost!
That would lead to build race condition.

Change-Id: I0b656db1538ca43d3785dbf17364ffa88b80ac41
2012-04-30 16:32:25 -07:00
Ying Wang
3024d2394f Strengthen dependencies on LOCAL_REQUIRED_MODULES
Bug: 6418863
This change expands the PRODUCT_PACKAGES with the required modules.
Before this change, since the required modules are not in the
PRODUCT_PACKAGES, they are not directly depended on by the image files.
If the dependent is not to be included in the image but the required
modules are to be included, the dependency of the image on the required
modules gets lost!
That would lead to build race condition.

Change-Id: Idbd504fd415b488c397e67ab487a22bff4fa188e
2012-04-30 15:48:27 -07:00
Jean-Baptiste Queru
e893fc100d am 30f6db7e: Move stuff from prebuilt/ to prebuilts/misc
* commit '30f6db7e31263bff6925a50343483ed86b7da352':
  Move stuff from prebuilt/ to prebuilts/misc
2012-04-30 10:23:54 -07:00
Jean-Baptiste Queru
30f6db7e31 Move stuff from prebuilt/ to prebuilts/misc
Change-Id: Ia13f5d09b24e3540042b6924ead6c96e94983ff4
2012-04-29 11:50:18 -07:00
Andrew Hsieh
f9613a4f73 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
2012-04-28 00:53:55 +08:00
Colin Cross
f8dc89b49a 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
2012-04-26 17:04:54 -07:00
Ying Wang
83dbd2f158 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
2012-04-26 12:27:38 -07:00
Nick Kralevich
233d460f21 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
2012-04-26 09:09:24 -07:00
Ying Wang
e5c3a09102 Merge "Make export_includes depend on the module's definition makefile." 2012-04-24 13:29:05 -07:00
Colin Cross
7e52424e4f Merge "Set timestamps of files from platform.zip to current time" 2012-04-24 12:45:47 -07:00
Colin Cross
2bea2e6565 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
2012-04-24 12:36:55 -07:00
Jean-Baptiste Queru
fcfb41379c Merge "On linux, always use the prebuilt host toolchain" 2012-04-24 10:37:30 -07:00
Ying Wang
68f1c77a8d 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
2012-04-23 21:29:18 -07:00
Jean-Baptiste Queru
e1a42cc8bf Whitelist audience
Change-Id: I3a39f4bdc5c52e01b7d5d187e35b6fbf770756e2
2012-04-23 18:27:18 -07:00
Jean-Baptiste Queru
4e82d1fa7f On linux, always use the prebuilt host toolchain
Change-Id: I8077c4780e1e3540e5e2133cf0ffa61d474d3acc
2012-04-20 19:04:56 -07:00
Keun young Park
ebb351e1b3 enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build

Bug: 6352960
Change-Id: I4a26bf26a51b95fb97c8b2adc9d32a543832c708
2012-04-20 16:34:33 -07:00
Keun young Park
e661e35829 Merge "Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"" 2012-04-20 16:20:42 -07:00
Keun young Park
b9566c0221 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 9283168e61
2012-04-20 16:18:34 -07:00
Jean-Baptiste Queru
a50ef1c124 Switch to new locations of toolchains
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
2012-04-20 16:15:42 -07:00
Colin Cross
d71a7f7bc8 Merge "Move pdk fusion platform.zip file under vendor/pdk" 2012-04-20 15:44:29 -07:00
Keun young Park
27f8946d2d Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK" 2012-04-20 12:02:34 -07:00
Keun young Park
9283168e61 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
2012-04-20 10:07:31 -07:00
Jing Yu
c856e31523 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
2012-04-20 07:53:16 -07:00
Doug Kwan
422a3650d3 Fix build problems with gcc-4.6.x.
Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
2012-04-20 07:52:47 -07:00
Colin Cross
b01807b36d Merge changes I9a390206,If3e9e846
* changes:
  build: separate dist tools and ota tools
  build: remove unused ota tools
2012-04-19 17:15:44 -07:00
Jean-Baptiste Queru
700741cf45 Merge "Use an https URL" 2012-04-19 15:06:10 -07:00
Jean-Baptiste Queru
5d4bcb490e Use an https URL
Change-Id: I9842d009b852df1882eaddb1bd53b216da0f4650
2012-04-19 14:53:27 -07:00
Colin Cross
c312f31871 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
2012-04-19 13:54:39 -07:00
Colin Cross
4049130cba build: remove unused ota tools
genext2fs, tune2fs, and e2fsck are no longer used by mkuserimg.sh.

Change-Id: If3e9e846e021de0973bde2702e60acdc9f4c57c7
2012-04-19 13:29:27 -07:00
Keun young Park
0da5e0ba36 Merge "enable recovery img build for PDK" 2012-04-19 10:25:20 -07:00
Keun young Park
782610165f enable recovery img build for PDK
Bug: 6363041
Change-Id: I25dff887dd0946c9506926e66e0514390c20692e
2012-04-19 09:55:24 -07:00
Colin Cross
21adee0184 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
2012-04-19 00:50:00 -07:00
Ying Wang
616e596385 Write out export_includes whenever the module is built.
Bug: 6362268
Change-Id: If872cf8fe597a02e6ca740a181cea85f486df98e
2012-04-18 17:35:55 -07:00
Ying Wang
c32af65886 Revert "Write out export_includes whenever the module is built."
This reverts commit 40c34f3778
2012-04-18 16:55:07 -07:00
Ying Wang
40c34f3778 Write out export_includes whenever the module is built.
Bug: 6362268
Change-Id: Ic5d028c108423c694736a06c05ec13093d42f1b8
2012-04-18 16:30:17 -07:00
Jean-Baptiste Queru
dbff3f5b77 Whitelist widevine
Change-Id: I4863b335ebc02d642874a4dd3dd9a8af93455d7b
2012-04-13 13:37:56 -07:00
Kevin Hester
db8698be85 am 6c703628: Allow packages to place manifest files in any directory
* commit '6c703628c54275797caf2b524686d3dd2e34385c':
  Allow packages to place manifest files in any directory
2012-04-13 07:53:58 -07:00