tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12550 commits 1 branch 0 tags 119 MiB
Commit graph

3024 commits

Author SHA1 Message Date
Elliott Hughes
14a2d978df am d0fb6930: am 07a58f8f: Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS." 
# Via Android Git Automerger (1) and others
* commit 'd0fb693024b88a713fe95296db451a0e6c17ec66':
  Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
 2013-02-13 17:11:36 -08:00
Elliott Hughes
d0542498a0 Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS. 
Because every ARM architecture we've ever supported has had both.

Change-Id: I607b56416e65073c5ac1b85fb17c092516e02573
 2013-02-13 16:44:21 -08:00
Stephen Hines
4cc701480c Merge "Remove dependency on libcompiler_rt.so for RS compatibility." 2013-02-13 22:36:15 +00:00
Stephen Hines
4404433876 Remove dependency on libcompiler_rt.so for RS compatibility. 
We are now using libcompiler_rt.a, so we don't need the shared version.

Change-Id: I1d35238581dc344de6918e037e89aa0362885e0e
 2013-02-13 14:13:40 -08:00
Ying Wang
59c8b6d122 Merge "Dont' write out the clean_steps.mk if" 2013-02-13 19:58:23 +00:00
Ying Wang
4a2f173339 Dont' write out the clean_steps.mk if 
If this is mm/mmm and there is no pre-existing clean_steps.mk.
Otherwise, the build system will run almost all the clean steps in the
sourcet tree if you do a full build next.

Change-Id: I5fe1e99c4f09629e4455319ea664cfba4ac634ea
 2013-02-13 11:57:45 -08:00
Ying Wang
8392284a70 Disable LOCAL_RENDERSCRIPT_COMPATIBILITY for non-arm builds 
This fixes the x86 build.

Change-Id: I370063fc83915c4c20cee08cc4feae68c7d7292b
 2013-02-13 10:48:28 -08:00
Ying Wang
32cca7eab4 Merge "Allow user to override the linux host toolchain." 2013-02-12 22:14:02 +00:00
Ying Wang
90397c1029 Add deps on LOCAL_SHARED_LIBRARIES for prebuilts. 
This is necessary for prebuilt build cache to work properly.

Change-Id: Ica28ce4d245a948142e067d82ff84ce1aef2134e
 2013-02-12 12:28:45 -08:00
Ying Wang
79e3f77996 Allow user to override the linux host toolchain. 
Bug: 8181840
Change-Id: Ib2a90d33414758e95b1a3c60db62c4188944dfdd
 2013-02-12 11:48:37 -08:00
Stephen Hines
6adffc196f Remove libcompiler_rt.so dependency for RS compat lib. 
Change-Id: I0d871c9c7d7946b8551fdefd201603bb59ea010e
 2013-02-11 20:03:38 -08:00
Ying Wang
bfa5fb145f Merge "mma and mmma" 2013-02-12 01:52:10 +00:00
Stephen Hines
7b3c71d1be Add libcompiler_rt.so as a JNI dependency for RS compatibility. 
Change-Id: I8840faaa86ae31abc3d78553eecdd1e642c6d15d
 2013-02-11 11:11:22 -08:00
Shih-wei Liao
48725b8384 Merge "Build RS compatibility library apps with libcompiler_rt.so too." 2013-02-11 18:01:17 +00:00
Shih-wei Liao
f3f8ea8678 Merge "Fix libcompiler-rt. Use the official name libcompiler_rt." 2013-02-11 17:48:46 +00:00
Ying Wang
b607f7bd4c mma and mmma 
augmented mm/mmm:
Their usages are the same as mm/mmm.
They build not only all modules in given path(s), but also their
dependencies.
With them, to run mm/mmm you don't need to run a full build first now:
Just run mma/mmma first.
Note that mma/mmma need to load all the makefiles in the source tree
so they are much slower than mm/mmm.
You should run mma/mmma the first time, and then mm/mmm for
incremental build.

Bug: 8163814
Change-Id: I554a97c0a23343b65c50870406225eb0064e0651
 2013-02-08 18:13:15 -08:00
Dirk Dougherty
9d38ec786d am 54096df3: am 1f7c3cb3: am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '54096df340b52254b8fe873d43f4de76806b788b':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
 2013-02-08 16:33:09 -08:00
Dirk Dougherty
54096df340 am 1f7c3cb3: am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '1f7c3cb3c2b475903c7616bf3f5b06530420cd94':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
 2013-02-08 16:30:26 -08:00
Dirk Dougherty
1f7c3cb3c2 am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '061c758cfa5409035854804efa1e0c4d32d2f007':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
 2013-02-08 16:27:11 -08:00
Dirk Dougherty
061c758cfa am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
# Via Dirk Dougherty
* commit '9fdf671d7f8fb96c1a8d3b41aaf4478e7274e45f':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
 2013-02-08 16:22:04 -08:00
Dirk Dougherty
9fdf671d7f Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds. 
Change-Id: Ib75e776d0220a86a08ddd5d7e09edd069af05da1
 2013-02-08 15:45:45 -08:00
Raghu Gandham
695fee31ad For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option 
So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.

Change-Id: I48fd6f2b0cbe80c3cd90f453ced97a2f154f7ad3
Signed-off-by: Rocky Zhang <yan@mips.com>
 2013-02-07 16:07:01 -08:00
Stephen Hines
90a94b4bb2 Build RS compatibility library apps with libcompiler_rt.so too. 
Change-Id: Ibc14ceb473bef23ab9e28f3a6bf7e4e99d529c01
 2013-02-07 14:00:27 -08:00
Shih-wei Liao
c8dfc169c8 Fix libcompiler-rt. Use the official name libcompiler_rt. 
Rename libcompiler-rt to libcompiler_rt.

Change-Id: I62e77d4dc83458bc238bd8320b70ddb7efe0dd12
 2013-02-07 13:46:29 -08:00
Stephen Hines
abee465031 Merge "Copy RS compatibility libraries to /system/lib/ for bundled builds." 2013-02-07 19:40:46 +00:00
Shih-wei Liao
f29dfa0c3a Merge "Fix depreciated -faddress-sanitizer. Use '-fsanitize=address' instead." 2013-02-07 10:29:49 +00:00
Stephen Hines
3b0fa1083e Copy RS compatibility libraries to /system/lib/ for bundled builds. 
Bug: 8138884
Change-Id: I74fb0c5835974af3c6e34fcd2d9ebfc2e7b08b4d
 2013-02-06 20:16:22 -08:00
Colin Cross
cc32951deb Merge "remove frameworks/base/opengl/include from default include path" 2013-02-06 21:42:44 +00:00
Colin Cross
f792a43c26 remove frameworks/base/opengl/include from default include path 
frameworks/base/opengl/include no longer exists, remove it from
the default include search path.

Change-Id: Ic9f096a303ff97ce610ae7e0dee26cbc1c106a2a
 2013-02-06 13:21:23 -08:00
Ying Wang
e56605ada2 Add LOCAL_POST_INSTALL_CMD 
With this support, you can piggy-back some symlinks when a module gets
installed.
This is especially helpful if the target of the symlink doesn't exist on
the build machine.

Change-Id: I48af7a90ce67475bc49b72f94a8753b94da98edd
 2013-02-06 11:44:41 -08:00
Dirk Dougherty
1151ef4f85 Fix droiddoc builds for second htmldir. 
Change-Id: If8e73508babf5e0cb4be271b4aef69317bb6467e
 2013-02-05 17:07:12 -08:00
Dirk Dougherty
e0f58f9559 am f0b7415e: am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit 'f0b7415e6e27120b6358445c3c58fef7cc43f28a':
  Add new droiddoc option for project-specific secondary html input/output paths.
 2013-02-04 16:43:28 -08:00
Iliyan Malchev
7b153753b2 Merge "pdk: fix build error on mac" 2013-02-04 18:32:01 +00:00
Sungmin Choi
79d51095bb pdk: fix build error on mac 
About symlink, show error on Mac.
To fix it, use 'rm' before 'cp'.

error log:
cp: symlink: /data/misc/audio/wcd9310_anc.bin: File exists
make: *** [out/target/product/mako/system/etc/firmware/wcd9310/wcd9310_anc.bin] Error 1

Bug: 8127112

Change-Id: I94e1677a6742cf4350e92bdffd58e6b782cf662c
 2013-02-04 10:31:25 -08:00
Tim Murray
9c5e29934f Merge "Attempt #2: libclcore.bc comes from prebuilts/sdk for unbundled projects." 2013-02-04 17:37:08 +00:00
Dirk Dougherty
f0b7415e6e am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths. 
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '34eb13de682225fbb6453f606ed75b3460c0a57d':
  Add new droiddoc option for project-specific secondary html input/output paths.
 2013-02-04 09:07:28 -08:00
Dianne Hackborn
aa8c2956c2 You would not believe how much we all love jelly beans. 
Seriously.

We looooooove them.

Especially Ryan.

Change-Id: I7ef04f1113147cb86a660c566b0d95d8c55eafd4
 2013-02-01 16:51:45 -08:00
Dirk Dougherty
34eb13de68 am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths. 
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '18a1a50f981449bb3dbd6bab3ee2502b51259fd7':
  Add new droiddoc option for project-specific secondary html input/output paths.
 2013-02-01 14:29:41 -08:00
Dirk Dougherty
18a1a50f98 am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths. 
# Via Dirk Dougherty
* commit '9c2336e073cef13a5237965dc7d5fcdb0091be34':
  Add new droiddoc option for project-specific secondary html input/output paths.
 2013-02-01 13:27:53 -08:00
Tim Murray
99b060f624 Attempt #2: libclcore.bc comes from prebuilts/sdk for unbundled projects. 
This change also adds the NDK library path for unbundled builds.

Bug: 7419958
Change-Id: Id8b608b5dd49d72bec697da8fa7a9393d2ab735f
 2013-02-01 12:01:38 -08:00
Ying Wang
5a8d3450b9 Check build even if a module it's built against SDK. 
Change-Id: I2466620e52541bb938721772ce9f63c12bc212db
 2013-01-30 14:43:05 -08:00
Ying Wang
1d977e3183 Refactor calculation LOCAL_CHECKED_MODULE 
To remove dup code;
Also added two more umbrella targets: host, target.

Change-Id: Ia6deed2940a26a31ad823fe54816840861f3fb72
 2013-01-30 14:23:58 -08:00
Ying Wang
ef1a9613cb Revert "Refactor calculation LOCAL_CHECKED_MODULE" 
This reverts commit ba99e69424

Change-Id: I3c42dea56376d26a5bb77b4944ae17a6875aadbb
 2013-01-30 20:44:49 +00:00
Ying Wang
ba99e69424 Refactor calculation LOCAL_CHECKED_MODULE 
To remove dup code;
Also added two more umbrella targets: host, target.

Change-Id: Ic82db571435cdbd10fd9e70e6c4195f4ca9ecd99
 2013-01-30 11:22:06 -08:00
Ying Wang
b6457c223b Don't fall back to host $(CC) if the target gcc is not checked out 
Error "cc1plus: error: unrecognized command line option
‘-mfloat-abi=softfp’" is much more confusing than
"...gcc: No such file or directory".
Also we don't build in Windows/Cygwin any more so we don't need the old
trick.

Change-Id: Ibbe3da67b412575e56bd6e61ef412ea5b2789fea
 2013-01-30 10:33:27 -08:00
Ying Wang
907f1513e8 Merge "Umbrella build targets to help engineers verify build" 2013-01-30 17:56:12 +00:00
Ying Wang
ef4d82f283 Umbrella build targets to help engineers verify build 
With this change, by choosing the right build target, you can reduce
significant verification build time:
If you are working on the framework, "make target-java" sounds enough;
if you are working on native target code, "make target-native" saves
your time by not building the Java code.
This will help reduce uncaught breakges for by default not everything
is built now.

Change-Id: I5a7c82d3f6372db03bea76155c8d6cc63d988eae
 2013-01-29 17:08:40 -08:00
Elliott Hughes
f689e21be2 am 5fb282d8: am 6463953e: am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h." 
# Via Android Git Automerger (2) and others
* commit '5fb282d89d00504772753acf1af63c5b422d21e2':
  Remove HAVE_DLADDR from AndroidConfig.h.
 2013-01-29 13:52:05 -08:00
Elliott Hughes
5fb282d89d am 6463953e: am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h." 
# Via Android Git Automerger (1) and others
* commit '6463953e169bbd559cada7263be363202ed40d02':
  Remove HAVE_DLADDR from AndroidConfig.h.
 2013-01-29 13:49:55 -08:00
Elliott Hughes
6463953e16 am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h." 
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'b796ce353d114328cc16a1f2ad2b1059b03a0c52':
  Remove HAVE_DLADDR from AndroidConfig.h.
 2013-01-29 13:47:14 -08:00
Elliott Hughes
b796ce353d Merge "Remove HAVE_DLADDR from AndroidConfig.h." 2013-01-29 21:28:58 +00:00
Simon Wilson
9e6f863b02 Merge "Add audio-route to pathmap.mk" 2013-01-29 20:03:59 +00:00
Dirk Dougherty
9c2336e073 Add new droiddoc option for project-specific secondary html input/output paths. 
Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
 2013-01-28 19:51:04 -08:00
Ying Wang
bdae340f24 Merge "No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR." 2013-01-29 03:26:02 +00:00
Ying Wang
4b8459de80 No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR. 
This removes unnecessary dependency if there is no
LOCAL_DROIDDOC_HTML_DIR.

Change-Id: If9e06b6e478a9cd61f5441aa376d996857ee2fb5
 2013-01-28 19:25:41 -08:00
Wink Saville
b7dca3a05b Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip" 2013-01-29 03:11:04 +00:00
-b master
c3ccfeee88 Build libcore without a dep on aapt. 
Currently building libcore (i.e. to get the core Java libraries) has a
dependency on AAPT. This is problematic for some users that don't want to pull
in the entirety of frameworks/base, e.g. for Dalvik development.

It turns out that all definitions.mk is using aapt for in this case is 'aapt
add -k <jar> <dex>', which adds a file to a JAR while stripping path info.
This is functionally equivalent to 'zip -j', and this CL just makes that
switch.

Change-Id: I292ecaf9d0321018bb7d2e68a49b2cc81de98a20
 2013-01-28 15:55:53 -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
Ying Wang
e79c71ff8a am 46fa45ad: am cf0a9042: am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES" 
# Via Android Git Automerger (2) and others
* commit '46fa45ad76ff63978bd35a07aa5e1d743657bf55':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
 2013-01-28 11:39:39 -08:00
Ying Wang
46fa45ad76 am cf0a9042: am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES" 
# Via Android Git Automerger (1) and others
* commit 'cf0a90426ad969bd2deb66b0c23079842b6c4fa2':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
 2013-01-28 11:36:51 -08:00
Ying Wang
cf0a90426a am 9e808ff7: Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES" 
# Via Gerrit Code Review (1) and Ying Wang (1)
* commit '9e808ff70515479458d39abfd64ed11eb55fefbb':
  Use += to append to target-specific PRIVATE_CLEAN_FILES
 2013-01-28 11:34:56 -08:00
Ying Wang
eda6ac2487 Use += to append to target-specific PRIVATE_CLEAN_FILES 
Instead of incorrectly including global variable PRIVATE_CLEAN_FILES

Change-Id: I9b5e12448dad5001de051a566d8a94a89b20ecac
 2013-01-28 10:58:01 -08:00
Shih-wei Liao
357a51c6e4 Fix depreciated -faddress-sanitizer. Use '-fsanitize=address' instead. 
-faddress-sanitizer' is deprecated.

Change-Id: I0c9cdf7422f4c9421c6cc81fbd033babcd856de7
 2013-01-27 01:44:37 -08:00
Elliott Hughes
2988a09f90 Remove HAVE_DLADDR from AndroidConfig.h. 
Change-Id: I014ce98c61b12169e381b769af34b682df46087e
 2013-01-25 15:57:40 -08:00
Stephen Hines
ba37043835 Remove references to llvm-rs-link, which is unused. 
Change-Id: I42433a9b1d2b525d1b09f778a10ab9689e34926e
 2013-01-25 15:26:16 -08:00
Stephen Hines
8f199b0588 Revert "libclcore.bc comes from prebuilts/sdk for unbundled projects." 
This reverts commit ba6a7e1d46

Change-Id: I2855923e67c226d39fe362342570e9ab96b885b8
 2013-01-23 18:39:05 +00:00
Stephen Hines
ba6a7e1d46 libclcore.bc comes from prebuilts/sdk for unbundled projects. 
This change also adds the NDK library path for unbundled builds.

Bug: 7419958

Change-Id: If22823c3890f5507d486e654a1e0296c06a2e239
 2013-01-22 17:56:37 -08:00
Stephen Hines
e9beb6ca1d Update build for LLVM merge to r171906. 
Change-Id: Ib1e701e548bd3e11cdee712fcbb8266447dfb21a
 2013-01-21 11:15:03 -08:00
Stephen Hines
9541f5864d Build RS compatibility objects with libcompiler-rt.a. 
Change-Id: Ic49fdc30b1d4568bbdc94338e116a31a1ade1e80
 2013-01-18 16:41:22 -08:00
Ying Wang
58aee9e30e am 383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too 
* commit '383ecfaf023dab1fcab25d97548093e32ef1a564':
  DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
 2013-01-17 18:13:08 -08:00
Ying Wang
383ecfaf02 DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too 
Cherry picked from commit fe3f62d06b
in master.  Since this is already in master, and we're upstream,
set to DO NOT MERGE.

Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
Signed-off-by: Mike J. Chen <mjchen@google.com>
 2013-01-17 17:58:18 -08:00
Simon Wilson
3b7d7b4664 Add audio-route to pathmap.mk 
Change-Id: Id72a839c188fdc93a6a10f53033f09aded23782e
 2013-01-16 17:35:27 -08:00
Ben Cheng
7028f5ec86 Stash TARGET_CPU_VARIANT and print it in dumpvar. 
Bug:7961327
Change-Id: I8a3637a87b5a0f791568fe74e44a4a173541deb7
 2013-01-16 10:01:26 -08:00
Ying Wang
4c49372c53 Support to switch between prebuilt and buiding from source 
For target shared library and executable.

Change-Id: I40a4e4e0c971811ac60e9bd04206f2422387d3d0
 2013-01-15 15:28:08 -08:00
Ben Cheng
62d947bfcb Merge "Use -mcpu=cortex-a15 for gcc arch dependent compilation." 2013-01-14 15:07:59 -08:00
Ben Cheng
533aa2707e Use -mcpu=cortex-a15 for gcc arch dependent compilation. 
If TARGET_CPU_VARIANT=cortex-a15 is specified in the BoardConfig.mk file.

Bug: 7961327
Change-Id: Ic459df378293237c54263f5315ac3be62dad4273
 2013-01-14 14:37:44 -08:00
Ying Wang
2ce71aa062 Add new LOCAL_PROGUARD_ENABLED option "nosystem" 
With which we don't include proguard flags defined by the build system.
Bug: 7990659

Change-Id: I78384d2fbaccdd714d646e1b648417195bbd8dde
 2013-01-11 15:31:45 -08:00
Ying Wang
fc1c1a217b am 71195ec7: am d01d0bf8: am 58a87c5c: Merge "core/Makefile: Allow specification of file locations" 
* commit '71195ec71fe3498b19ff9ff8e4eb924b8fa507e6':
  core/Makefile: Allow specification of file locations
 2013-01-04 17:50:46 -08:00
Ying Wang
61fc136d39 am a40166d1: am 5455455a: am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools. 
* commit 'a40166d11c597038b30eab6122f8967ee1c810b3':
  Add simg2img and e2fsck to the otatools.
 2013-01-04 17:50:43 -08:00
Ying Wang
71195ec71f am d01d0bf8: am 58a87c5c: Merge "core/Makefile: Allow specification of file locations" 
* commit 'd01d0bf86c2309a7a950549c9c124b303c0c3f82':
  core/Makefile: Allow specification of file locations
 2013-01-04 15:30:28 -08:00
Ying Wang
d01d0bf86c am 58a87c5c: Merge "core/Makefile: Allow specification of file locations" 
* commit '58a87c5c010e474a1e321d3fe6ce1ad8267576b5':
  core/Makefile: Allow specification of file locations
 2013-01-04 15:28:20 -08:00
Ying Wang
a40166d11c am 5455455a: am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools. 
* commit '5455455a3e550821b381d061803133c82956d7ec':
  Add simg2img and e2fsck to the otatools.
 2013-01-04 15:01:18 -08:00
Ying Wang
5455455a3e am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools. 
* commit 'a6f10400e16e80529e2dbbcd44742e55a99e0c3b':
  Add simg2img and e2fsck to the otatools.
 2013-01-04 14:59:20 -08:00
Ying Wang
a6f10400e1 am 7dc45a8b: Add simg2img and e2fsck to the otatools. 
* commit '7dc45a8bdc744db4d9c742dc21bfe328ad9ba10f':
  Add simg2img and e2fsck to the otatools.
 2013-01-04 14:55:21 -08:00
Ying Wang
7dc45a8bdc Add simg2img and e2fsck to the otatools. 
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
 2013-01-04 14:43:18 -08:00
Andrew Boie
fa61ff093e core/Makefile: Allow specification of file locations 
If multiple build targets use a common recovery.fstab or system.prop,
this allows them to live in a centralized location and not be copied
or symlinked to the device directories.

Change-Id: I7aeb31ed9dc9b43a5e2c9e46fe582b10cba71b24
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2013-01-04 11:45:38 -08:00
Andrew Hsieh
0b676b353a am dd319cef: am 26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS" 
* commit 'dd319cef3f0e351f0b1621167b22eb39e86b27ad':
  Switch to GCC 4.7 for X86 and MIPS
 2012-12-28 09:47:53 -08:00
Andrew Hsieh
dd319cef3f am 26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS" 
* commit '26f47aba2d973bc1cc459a63df7bd0eec799f4ff':
  Switch to GCC 4.7 for X86 and MIPS
 2012-12-21 15:51:44 -08:00
Andrew Hsieh
098a5968fa Switch to GCC 4.7 for X86 and MIPS 
Change-Id: I1c2021a15f53e064baf69084894c114289ef7c54
 2012-12-21 09:23:05 +08:00
Ying Wang
c46bd076ff am ead4b642: am 5f97f2b6: am 6a6c1121: Run e2fsck on built sparse images. 
* commit 'ead4b642cffe258e08326628af2c83c99c14df1f':
  Run e2fsck on built sparse images.
 2012-12-18 23:09:09 -08:00
Ying Wang
ead4b642cf am 5f97f2b6: am 6a6c1121: Run e2fsck on built sparse images. 
* commit '5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c':
  Run e2fsck on built sparse images.
 2012-12-18 15:32:51 -08:00
Ying Wang
5f97f2b6d6 am 6a6c1121: Run e2fsck on built sparse images. 
* commit '6a6c11215bdf3f114ed3589ede4bda006adacf7e':
  Run e2fsck on built sparse images.
 2012-12-18 15:28:50 -08:00
Stephen Hines
f692513071 Clean up libRSSupport.so and libclcore.bc dependencies. 
Bug: 7419958
Change-Id: I62453bb6830cc2c82ca9dbbf576b52da95eef4b1
 2012-12-17 17:59:47 -08:00
Ying Wang
3a990aee1e Merge "Build from source or prebuilt" 2012-12-14 14:52:16 -08:00
Ying Wang
63d94fa305 Build from source or prebuilt 
With this change, you can easily switch between building from source
code and prebuilt.
Set LOCAL_PREBUILT_MODULE_FILE to the path of the prebuilt file,
relative to the top of the source tree, in the usual module definition.
The prebuilt will be used unless any of the followings satisfied:
1) ANDROID_BUILD_FROM_SOURCE is "true", which disable prebuilt globally;
2) The module name is in ANDROID_NO_PREBUILT_MODULES;
3) The LOCAL_PATH is prefixed by any of ANDROID_NO_PREBUILT_PATHS.
A developer can set ANDROID_NO_PREBUILT_MODULES or
ANDROID_NO_PREBUILT_PATHS to build only his own module(s) from source,
while build other modules from prebuilts.
You can set ANDROID_BUILD_FROM_SOURCE to true to build everything from
source.
Those variables can be set with shell environmental variable or in your
buildspec.mk.

Sometimes module B is able to be built from source only if module A is
also
built from source, for example, if B is the test apk of A.
In that case, you can use the macro include-if-build-from-source to
include B's Android.mk only if A is built from source too, or
if-build-from-source to conditionally include the definition of module
B,
if their module definitions are in the same Android.mk.

Support host-executable-hook and host-shared-library-hook.

Change-Id: Icab7cf028c87eaba0dd7efc2a7749fd6f32b44e4
 2012-12-14 14:48:00 -08:00
Stephen Hines
7d6ec71965 Add -nostdlib to RS bc->so linker command line. 
Change-Id: Ic715060c3d037ec9fecb0ad9b2be6c2e7052ce0a
 2012-12-13 19:24:50 -08:00
Ben Cheng
9c68f06a54 Merge commit 'ec4caba7' into manualmerge 
Conflicts:
	CleanSpec.mk

Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a
 2012-12-13 11:03:58 -08:00
Ben Cheng
ec4caba79c Enable lunch command to pick up new toolchain version. 
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.

Change-Id: Icdacb8c46034b8a24a9875b7596b31d00861512a
 2012-12-13 10:43:55 -08:00
Ben Cheng
914f7fd938 Enable lunch command to pick up new toolchain version. 
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.

Change-Id: I13b9cca2d288f7ab09104c57e7cad9f23de2548a
 2012-12-12 21:56:58 -08:00
Stephen Hines
0f28a1d90c Merge "Build rules for Renderscript compatibility library." 2012-12-12 15:01:46 -08:00
Stephen Hines
e719f28d93 Build rules for Renderscript compatibility library. 
Bug: 7419958
Change-Id: I2e0f0bb632e6ff22b2cf1a1b96b28364637995cc
 2012-12-12 14:58:02 -08:00
Nick Kralevich
cced518b1e It's a new version! 
Change-Id: I97ba954c8726ae3b64c43260ce221642d5865c6d
 2012-12-12 13:41:54 -08:00
Ben Cheng
02d29216c9 am b3a68f6e: am 62f1d86e: Merge "Define TARGET_GCC_VERSION in target specific make files." 
* commit 'b3a68f6e002cdbc946d08a76656067d63542a98a':
  Define TARGET_GCC_VERSION in target specific make files.
 2012-12-11 16:53:05 -08:00
Ben Cheng
b3a68f6e00 am 62f1d86e: Merge "Define TARGET_GCC_VERSION in target specific make files." 
* commit '62f1d86e4850bdc4f470cf1f0c2428f5b427a347':
  Define TARGET_GCC_VERSION in target specific make files.
 2012-12-11 16:51:13 -08:00
Ben Cheng
5011dd80ee Refresh ARM toolchain to GCC 4.7 / binutils 2.22. 
Change-Id: Id3689376ae4c4fc183569955b2ee98df5c069510
 2012-12-11 16:41:01 -08:00
Ying Wang
6a6c11215b Run e2fsck on built sparse images. 
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
 2012-12-11 14:57:39 -08:00
Ben Cheng
054ffd2e7c Define TARGET_GCC_VERSION in target specific make files. 
So that GCC refresh can be performed in a target specific way.

Change-Id: I867e8b8fd671bef8c5af300e657a6da4fface032
 2012-12-11 14:03:18 -08:00
Nick Kralevich
b3f0eb16b2 am 7cd20491: am a303510f: Merge "x86: enable FORTIFY_SOURCE" 
* commit '7cd204914ef59c4ce96210539489ec3e76942bb4':
  x86: enable FORTIFY_SOURCE
 2012-12-11 10:35:17 -08:00
Nick Kralevich
7cd204914e am a303510f: Merge "x86: enable FORTIFY_SOURCE" 
* commit 'a303510f133e0e20aefedd7d03adfbb88cb85a54':
  x86: enable FORTIFY_SOURCE
 2012-12-11 10:33:14 -08:00
Nick Kralevich
40febcad47 x86: enable FORTIFY_SOURCE 
Enable FORTIFY_SOURCE for Android x86.  This adds certain security
protections to Android programs, checking for common programming
mistakes and buffer overflows.

FORTIFY_SOURCE protections have been enabled for ARM since
a46c480e43 (Jun 4th 2012)

Change-Id: Idae6f93d37ddae605088867cd3029f12632456e1
 2012-12-07 17:20:28 -08:00
Ying Wang
19cc22bc9c Move numeric api files from frameworks/base to prebuilts/sdk 
So they can be used in unbundled builds.

Bug: 7296240
Change-Id: I5f176322dec30323f365188fb3e379def60dc1b8
 2012-12-04 15:07:34 -08:00
Ying Wang
ae5979bd24 Merge "Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too" 2012-12-03 18:33:54 -08:00
Ying Wang
fe3f62d06b Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too 
Change-Id: I09e8e849f642792e3a74e2564820ab9bbf1eb28c
 2012-12-03 18:24:55 -08:00
Ying Wang
36d46e6e12 am d3a561da: am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true" 
* commit 'd3a561da10406b482107a052c9c60cf1be80e930':
  Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
 2012-12-03 16:09:35 -08:00
Ying Wang
d3a561da10 am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true" 
* commit 'f8b804f8c532c6d913d8389f9a8e4c05a8f0310c':
  Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true
 2012-12-03 16:07:25 -08:00
Ying Wang
96aa714534 Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true 
Change-Id: Id516716eaa90534f1b51133d5fb97468e52802dd
 2012-12-03 15:49:13 -08:00
Jean-Baptiste Queru
fb28a3a4e5 resolved conflicts for merge of 0f4e3718 to master 
Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8
 2012-12-03 15:05:25 -08:00
Jean-Baptiste Queru
0f4e3718df Merge d2e4c25e 
Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
 2012-12-03 14:46:37 -08:00
Dianne Hackborn
d2e4c25e3f am b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev 
* commit 'b7157909185968064db922bff6d7b1baabe305f4':
  Obviously JB MR1.1 should be Android 4.2.2.
 2012-12-03 14:26:03 -08:00
Dianne Hackborn
aa48e74b60 Obviously JB MR1.1 should be Android 4.2.2. 
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
 2012-12-03 11:07:37 -08:00
Ying Wang
69e9b4d6d1 Run e2fsck on built sparse images. 
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
 2012-11-27 09:57:17 -08:00
The Android Open Source Project
a2314e433e Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
 2012-11-27 08:06:10 -08:00
Ying Wang
be09a520c5 am 71958cca: Merge "Establish explicit dependency on selinux file_contexts." 
* commit '71958cca5d5d5b569a2bb2ad2a4baf53045334e9':
  Establish explicit dependency on selinux file_contexts.
 2012-11-21 12:22:23 -08:00
Ying Wang
9362c7ffdd Establish explicit dependency on selinux file_contexts. 
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory

Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
 2012-11-21 11:09:45 -08:00
Ying Wang
fdbd9cbe2e Establish explicit dependency on selinux file_contexts. 
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory

Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
 2012-11-21 10:47:00 -08:00
Jean-Baptiste Queru
136383549f Merge f7306051c1 
Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
 2012-11-19 15:08:59 -08:00
Ed Heyl
f7306051c1 am 0ddeb0cc: am efcc8b1c: bump version to 4.2.1 
* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
  bump version to 4.2.1
 2012-11-19 14:29:37 -08:00
Ed Heyl
0ddeb0ccc1 am efcc8b1c: bump version to 4.2.1 
* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
  bump version to 4.2.1
 2012-11-19 14:26:49 -08:00
Ed Heyl
efcc8b1c79 bump version to 4.2.1 
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
 2012-11-19 14:20:48 -08:00
Jean-Baptiste Queru
9d9def1b18 resolved conflicts for merge of 4749c6e3 to jb-mr1-dev-plus-aosp - do not merge 
Change-Id: I51fcb88d6b9f188a9c596031a2506eedc7150173
 2012-11-19 10:57:48 -08:00
Chirayu Desai
6d492971dd build_id: change to OPENMASTER 
Change-Id: I87863d8064515a0fabadacf4ca692c775fc4aae0
 2012-11-18 14:09:34 +05:30
Ben Cheng
2a43d74fb4 am bf031a25: am 17c679d0: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*." 
* commit 'bf031a2586daccf2a47a66c7cc80ac050ba1c16a':
  [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
 2012-11-16 16:25:51 -08:00
Ben Cheng
bf031a2586 am 17c679d0: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*." 
* commit '17c679d07380b0a4045045fd5d8e56111edf3fbd':
  [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
 2012-11-16 16:23:02 -08:00
Ben Cheng
8bc4c438bd [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*. 
In the future to upgrade the gcc version we just need to edit one
line in core/config.mk.

Change-Id: I01bb38c38f2388913bb7369aa4b2da480411dfbe
 2012-11-16 13:29:13 -08:00
Ying Wang
90304a74a3 am ae56a570: am e1f94189: am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev 
* commit 'ae56a570cb7e16a0853433d20691b0ee72da5cc2':
  Move check-api to definition.mk
 2012-11-16 10:42:41 -08:00
Guang Zhu
fdf573e4e0 am 06b57cef: am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1 
* commit '06b57cefeaadd0e2f02a5c8a8679884366f4345e':
  DO NOT MERGE: change build id to JB MR1.1
 2012-11-15 18:00:23 -08:00
Guang Zhu
06b57cefea am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1 
* commit 'f0d4d8f32934df6dc859e2b668d436d67b388cd2':
  DO NOT MERGE: change build id to JB MR1.1
 2012-11-15 17:57:58 -08:00
Guang Zhu
f0d4d8f329 DO NOT MERGE: change build id to JB MR1.1 
Among other things, this helps monitoring of automated tests, to
properly show which branch the device is running on

Change-Id: I8bb8e3ec347849da44d29ce502b09a593d61ae0e
 2012-11-15 17:47:53 -08:00
Ying Wang
ae56a570cb am e1f94189: am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev 
* commit 'e1f94189d95084a72d206d89ecb9d38de0512fc6':
  Move check-api to definition.mk
 2012-11-15 15:23:44 -08:00
Ying Wang
e1f94189d9 am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev 
* commit 'ce811261bc8d56d43e59b1f9fb96ae53192de126':
  Move check-api to definition.mk
 2012-11-15 15:20:58 -08:00
Ying Wang
c065da2307 Move check-api to definition.mk 
1) Move check-api to definition.mk, so it can be used in other places.
2) Add additional dependency to the api-stub module to consolidate the
apicheck dependency. Previously you have to run 2 "make"s in a row and
only in the 2nd run apicheck is run, due to a gnu-make optimization.

Bug: 7540265
Change-Id: Ib24ed87d9330027a9f95ed7b16dd4002cc0e3198
 2012-11-14 16:00:45 -08:00
Ying Wang
31df068b38 Additional certificates support for an apk. 
Change-Id: I5b35d5728ba9d65f7ece956127270a9ca2ea0efe
 2012-11-13 10:56:04 -08:00
Ying Wang
3482e9256b am eb98e088: am 865d851a: Merge "Remove the obsolete comments and change the misleading var name." 
* commit 'eb98e088937c4568f75d965dee1ef8d5c6689213':
  Remove the obsolete comments and change the misleading var name.
 2012-11-12 14:50:44 -08:00
Ying Wang
eb98e08893 am 865d851a: Merge "Remove the obsolete comments and change the misleading var name." 
* commit '865d851a8012e13c35d573d98770b7187d32b7f7':
  Remove the obsolete comments and change the misleading var name.
 2012-11-12 14:45:59 -08:00
Ying Wang
85e8cda340 Remove the obsolete comments and change the misleading var name. 
Change-Id: Ib19099cbce0133f5c7df44fa0fd80215809a1ad8
 2012-11-12 14:31:20 -08:00
Andrew Hsieh
e4041746d3 am abfb2522: resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master 
* commit 'abfb25226aabdbda7f8900e923754beb7f8cb94d':
  Use prebuilt gcc for MacOSX
 2012-11-12 13:38:21 -08:00
Andrew Hsieh
abfb25226a resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master 
Change-Id: I588a055812ddc8f4531c9d02994beb366f9aab3e
 2012-11-12 12:50:03 -08:00
Andrew Hsieh
e2e28f6d02 Use prebuilt gcc for MacOSX 
1. Use prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1
   See https://android-review.googlesource.com/#/c/46223/
2. Rewrite logic dealing with mac_sdk_version to support all
   MacOSX SDK 10.6, 10.7 and 10.8.  Note that since
   ad2342375963c2468849c1f83a97158383db6511 emulator no longer
   depends on 10.6 to build.  Since the lowest SDK among intersection
   of the "available" and the "supported" SDKs is picked, add a
   new variable MAC_SDK_VERSION for developer really want to overwrite
   it.  MAC_SDK_VERSION still has to be one of the supported, though.
3. Improve mac_sdk_path detection to deal with case where Xcode
   *dmg is mounted only, not installed at /Applications.
4. Now we can retire BUILD_MAC_SDK_EXPERIMENTAL

Change-Id: I83e463556a857d527710f766de0e19e1b576151f
 2012-11-12 10:44:52 -08:00
Andrew Hsieh
60a34ed501 am fc76f0eb: am 2ea957a3: Merge "Revise checks for MacOSX to build emulator" 
* commit 'fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1':
  Revise checks for MacOSX to build emulator
 2012-11-09 11:12:42 -08:00
Andrew Hsieh
fc76f0eb17 am 2ea957a3: Merge "Revise checks for MacOSX to build emulator" 
* commit '2ea957a373018ba6773c621065164256f0d84078':
  Revise checks for MacOSX to build emulator
 2012-11-09 10:28:36 -08:00