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
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
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
9e808ff705
Merge "Use += to append to target-specific PRIVATE_CLEAN_FILES"
2013-01-28 19:05:30 +00: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
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
022a9336e5
Merge "Build RS compatibility objects with libcompiler-rt.a."
2013-01-19 01:22:22 +00: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
d50364fdab
am 58aee9e3: (-s ours) am 383ecfaf: DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
...
* commit '58aee9e30e3a8dd4471344d9ae5c514c38b42548':
DO NOT MERGE: Support LOCAL_EXPORT_C_INCLUDE_DIRS for prebuilts too
2013-01-17 18:15:01 -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
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
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
Scott Main
b6fd569c0c
am 85ab41eb: am fb959d01: am 474b3f11: am eb41035f: docs: add the ability to pause the carousel
...
* commit '85ab41eb6b7229dd1fcb08187f27a32ee754c05d':
docs: add the ability to pause the carousel
2013-01-14 21:16:42 -08:00
Scott Main
85ab41eb6b
am fb959d01: am 474b3f11: am eb41035f: docs: add the ability to pause the carousel
...
* commit 'fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
docs: add the ability to pause the carousel
2013-01-14 21:13:27 -08:00
Scott Main
fb959d01d5
am 474b3f11: am eb41035f: docs: add the ability to pause the carousel
...
* commit '474b3f1198223b61f912c29d2e5c069dcfe322e0':
docs: add the ability to pause the carousel
2013-01-14 21:10:48 -08:00
Scott Main
474b3f1198
am eb41035f: docs: add the ability to pause the carousel
...
* commit 'eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
docs: add the ability to pause the carousel
2013-01-14 21:07:29 -08:00
Scott Main
eb41035fcf
docs: add the ability to pause the carousel
...
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
2013-01-14 20:47:40 -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
Scott Main
0a24bca9f5
am 18ae42f3: am 468a239d: am 8d0a978a: am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '18ae42f3c84744eca9fd96afcbcf365427e1578f':
docs: update analytics script to support event tracking
2013-01-10 15:38:23 -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
Scott Main
18ae42f3c8
am 468a239d: am 8d0a978a: am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '468a239d0cc522623f1896b3837092f629393292':
docs: update analytics script to support event tracking
2013-01-08 18:59:29 -08:00
Scott Main
468a239d0c
am 8d0a978a: am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
docs: update analytics script to support event tracking
2013-01-08 18:56:40 -08:00
Scott Main
8d0a978aea
am 869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '869f3d1f68194b5962070394882b85f46a415c4c':
docs: update analytics script to support event tracking
2013-01-08 18:49:51 -08:00