Commit graph

8228 commits

Author SHA1 Message Date
Raphael Moll
a3f122abb9 Fix build: Revert "SDK: Enable monitor in sdk product."
This reverts commit 0022a035d6.
2012-03-23 10:45:20 -07:00
James Dong
49cc9bacbf Merge "Fix missing xml configuration files for sdk builds" 2012-03-23 09:20:58 -07:00
Raphael Moll
2596df4d6b Merge "SDK: Enable monitor in sdk product." 2012-03-23 09:16:04 -07:00
Stephen Hines
e3a8b62d79 Merge "Make sure compiler flags also pick up correct toolchain." 2012-03-23 05:33:17 -07:00
Stephen Hines
62304f1ec3 Make sure compiler flags also pick up correct toolchain.
Change-Id: Id6ff8c3ee7cfa5dee46ef000cbceb7666b934240
2012-03-22 21:26:17 -07:00
James Dong
f0813c27a1 Fix missing xml configuration files for sdk builds
o related-to-bug: 6132480

Change-Id: Ib08ce4cf7ef4d85ab888804c7c4a3d1337370e52
2012-03-22 19:18:35 -07:00
Colin Cross
0bf80735ec build: move Zip* from libandroidfw to libutils
ZipUtils is needed by build/tools, move it from libandroidfw
(frameworks/base) to libutils (frameworks/native).

Change-Id: I188247d058f1baa0ebd14282208d496c4ba061be
2012-03-22 18:47:23 -07:00
Ying Wang
d6bfbb652f Merge "Don't expose the compiler dependency." 2012-03-22 11:27:17 -07:00
Ying Wang
dfbe79b803 Don't expose the compiler dependency.
Change-Id: Ia472eaab3e8e883a32e8b441a2480562db278e45
2012-03-22 11:26:22 -07:00
Andrew Hsieh
329fd9b58d am f2b45aa6: am 5d9aedef: am 2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit 'f2b45aa676a154ddb3649e3b95d16f6b82392dec':
  Point to new linux prebuilt toolchain for SDK build
2012-03-22 11:08:57 -07:00
Andrew Hsieh
f2b45aa676 am 5d9aedef: am 2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '5d9aedef3067d458e356a6c13a26ad71041ff04b':
  Point to new linux prebuilt toolchain for SDK build
2012-03-22 11:06:34 -07:00
Andrew Hsieh
5d9aedef30 am 2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '2245d17dc847ecb5371807466788552ca0198152':
  Point to new linux prebuilt toolchain for SDK build
2012-03-22 11:03:14 -07:00
Andrew Hsieh
2245d17dc8 Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
2012-03-22 09:55:36 -07:00
Evgeniy Stepanov
b71e2df30a Add LOCAL_CLANG variable to switch C/C++ build environment to Clang.
Change-Id: I8ca1c24f51aa5546ac9618d31566a52e4fdb1436

Conflicts:

	core/clear_vars.mk
2012-03-22 07:31:27 -07:00
Stephen Hines
0e4c317c92 Merge "Define a basic llvm-link + clang environment" 2012-03-22 07:28:41 -07:00
Raphael Moll
0022a035d6 SDK: Enable monitor in sdk product.
Requires change sdk.git change I7afbd63b

Change-Id: Ifb31e2e36ea92a0fdd0996a387c00f0edc2e4218
2012-03-21 21:30:11 -07:00
Mike Lockwood
80eca91fb5 Merge remote-tracking branch 'goog/ics-aah-exp' 2012-03-21 17:08:39 -07:00
Mike Lockwood
1c06bc778c Merge commit '7d2ba7c' 2012-03-21 17:08:21 -07:00
Mike Lockwood
bd570f7125 Merge commit 'a66c512'
empty -s ours merge

Change-Id: Id71a9514bdf0a8ca9c4c5ab847387b8ea544d0ab
2012-03-21 17:08:07 -07:00
Mike Lockwood
e8eb8df989 Merge commit 'c6e952f'
Don't build userdata.img for tests build.

Change-Id: I492cca5e5989cabdeb6f75c3b8a8c9ac3b9ca8c8
2012-03-21 17:01:18 -07:00
Mike Lockwood
035e1885fb Merge commit 'c20c683'
empty -s ours merge

Change-Id: I877d10b1d4459d148724353ed2a95764c3dbf0ae
2012-03-21 17:00:52 -07:00
Mike Lockwood
3c05c2fee8 Merge commit '2d50524'
empty -s ours merge to skip change:

    main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS

Change-Id: Id79485ba1c5ddae222e4d7bedb05efadff168f00
2012-03-21 16:58:40 -07:00
Mike Lockwood
b5494f5b75 Merge commit 'a09c24d' 2012-03-21 16:55:23 -07:00
Steve Block
34268ebd69 Merge "Add a comment about publishing licenses for third-party code" 2012-03-21 10:17:46 -07:00
Steve Block
d14d3b4e64 Add a comment about publishing licenses for third-party code
Change-Id: I21bee0bb78ab42b4f7b6a938f94653c7e21e8503
2012-03-21 17:05:11 +00:00
Doug Zongker
8f3670bbc5 fix build: make check_radio_versions.py okay with no args
Change-Id: I3539383d9761b57152c04ba9198c724509ba6223
2012-03-21 10:01:01 -07:00
Doug Zongker
2c4dc95767 Merge "optional cross-check between OTA radio images and board-info.txt" 2012-03-21 09:47:25 -07:00
Doug Zongker
9296f09277 optional cross-check between OTA radio images and board-info.txt
Adds a python script which checks the version of each radio image
added with the new add-radio-file-checked macro against a file
containing sha-1 -> version string mappings and the contents of
board-info.txt, so that the build can fail if board-info.txt and the
OTA images are out of sync.

Change-Id: Icb61dc2adefc240ced9059941582c23b629089c0
2012-03-21 09:18:15 -07:00
The Android Open Source Project
2fdadb7cd4 am 177a169c: am 8544aac8: Reconcile with ics-mr1-release
* commit '177a169cdc334981ca8c668fcfe412755eb8484e':
2012-03-21 09:05:53 -07:00
The Android Open Source Project
177a169cdc am 8544aac8: Reconcile with ics-mr1-release
* commit '8544aac859400ee7c0109f996930b22455028dbe':
2012-03-21 09:03:25 -07:00
The Android Open Source Project
8544aac859 Reconcile with ics-mr1-release
Change-Id: If78df17136dfe425e6752b315590b47d4c135d21
2012-03-21 09:00:34 -07:00
The Android Open Source Project
142d2cc9d4 am cd68729d: am 7000342d: Reconcile with ics-mr1-release
* commit 'cd68729dece4b654265c61bafd2ed05575fbdab2':
  IMM76B
  IMM76
  IMM72B
  IMM72
  second try
  IMM68C
  IMM70
  IMM62B
  IMM69
  IMM68B
  IMM68
2012-03-21 08:27:29 -07:00
The Android Open Source Project
cd68729dec am 7000342d: Reconcile with ics-mr1-release
* commit '7000342da9241170fa831a8ec887ecc6f4aa426d':
  IMM76B
  IMM76
  IMM72B
  IMM72
  second try
  IMM68C
  IMM70
  IMM62B
  IMM69
  IMM68B
  IMM68
2012-03-21 08:25:04 -07:00
The Android Open Source Project
7000342da9 Reconcile with ics-mr1-release
Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8
2012-03-21 08:22:52 -07:00
Ying Wang
d4a41953fe am 0187511e: am 4243532d: am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '0187511e70960618ac5c84f1446ec955ba6c8955':
  Fix for "dexopt: No such file or directory" error
2012-03-20 19:36:30 -07:00
The Android Automerger
54578dd1aa IMM76B 2012-03-20 17:15:23 -07:00
Ying Wang
0187511e70 am 4243532d: am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '4243532d4a0ec368d6722265af94ebd962877623':
  Fix for "dexopt: No such file or directory" error
2012-03-20 15:24:55 -07:00
Ying Wang
4243532d4a am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '301843ae3e5a5d121ecc01b58ea3f15ae07c860f':
  Fix for "dexopt: No such file or directory" error
2012-03-20 15:22:30 -07:00
Ying Wang
301843ae3e am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '29e44b7a8300644516b021e9e324ffe426098b3f':
  Fix for "dexopt: No such file or directory" error
2012-03-20 15:20:14 -07:00
James Dong
88101926d9 Merge "Added media_codecs.xml file to generic_x86 and vbox_x86 configuration files" 2012-03-20 11:36:25 -07:00
Ying Wang
29e44b7a83 Merge "Fix for "dexopt: No such file or directory" error" 2012-03-20 11:05:56 -07:00
yroussel
1319005a2a Define a basic llvm-link + clang environment
Move it from dalvik/vm/translator/runtime/ to build/
Add handling of -march=armv5te and -march=armv5e
2012-03-20 17:39:29 +04:00
James Dong
e25a5198bb Added media_codecs.xml file to generic_x86 and vbox_x86 configuration files
o related-to-bug: 6132480

Change-Id: I82753468676d3b1ecba892c993de11ef779eed01
2012-03-19 14:11:00 -07:00
Dima Zavin
992a52990c core: the device/board/product kernel headers will be auto-generated
So, just add the output include directory to the include path

Change-Id: Ia370454237913a748288124f65a6b731b17d6e1a
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-19 12:32:08 -07:00
Dima Zavin
f926990ba3 core: allow product to provide kernel headers as well
This is useful when a device inherits from an architecture
product, such as omap4.mk. The architecture specific product
can provide kernel headers to all the devices that use
that architecture.

Change-Id: I0c9d3120a6089fb535a3fa8eccf10775a271cd21
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-19 12:32:08 -07:00
The Android Automerger
fe0a544ea6 IMM76 2012-03-16 19:36:35 -07:00
The Android Automerger
83defc2504 merge in ics-mr1-release history after reset to ics-mr1 2012-03-16 19:30:18 -07:00
Keun young Park
59c2136e1b Merge "rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel" 2012-03-16 12:35:40 -07:00
Dima Zavin
4e16f96dbd core: allow devices to provide their own device specific kernel headers
Currently, we need to pollute the common bionic/libc/kernel/...
directory with device specific kernel headers. This has created a giant
dumping ground of headers from all the projects we have ever done.

Allow each device to provide their own headers and thus eventually allow
bionic/libc/kernel to become *just* the common linux kernel headers.

This change will automatically add device/oem/name/kernel-headers to
the include list and also allow the BoardConfig.mk to specify
additional directories with TARGET_BOARD_KERNEL_HEADERS variable.
The requirement is that the final dir name must be kernel-headers to
mark explicitly where kernel headers are kept.

Change-Id: I7d32a979eef1f464db06c1bc448a04ddc3575efd
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-15 13:22:48 -07:00
Keun young Park
9ec15ec89c rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel
Change-Id: Iadf0493b1f6700638010ceb50ced2fe7bc8bb603
2012-03-15 12:23:05 -07:00