Commit graph

2928 commits

Author SHA1 Message Date
Ying Wang
5938039677 am 7ce7473f: am 5e12e60b: Merge "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."
* commit '7ce7473f866fc5356291f38a3437a071ea5fd00d':
  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.
2013-02-15 14:48:01 -08:00
Ying Wang
5e12e60b47 Merge "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." 2013-02-15 19:33:59 +00: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
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