OSDN Git Service
Doug Zongker [Tue, 17 Jan 2012 18:55:37 +0000 (10:55 -0800)]
add device-specific hooks at start of OTA phases
Change-Id: I47534e6d40e7918ee8cb9e87d76d9030b9273708
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:20:34 +0000 (11:20 -0800)]
am
da3631db: (-s ours) am
fdbb9f94: am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
da3631dbd120219b883973bb22b64ebd3ef33078':
Remove mention of layoutopt/uix as they are gone.
Jean-Baptiste Queru [Fri, 13 Jan 2012 01:20:28 +0000 (17:20 -0800)]
am
fdbb9f94: am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
fdbb9f94bc4b22f60fb46d0babb52c2a0d047aef':
Remove mention of layoutopt/uix as they are gone.
Jean-Baptiste Queru [Fri, 13 Jan 2012 01:18:48 +0000 (17:18 -0800)]
am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
96a228bd7904b83274575522a267d178b3da2341':
Remove mention of layoutopt/uix as they are gone.
Ying Wang [Fri, 13 Jan 2012 00:38:17 +0000 (16:38 -0800)]
Compute TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX.
Sometimes TARGET_TOOLS_PREFIX is passed in as command line makefile
variable or environmental variable without TARGET_TOOLCHAIN_ROOT.
This change computes TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX in
that case.
Change-Id: I0a37dc1f4d1e3e1951faeffd5e9f926f0a6614dd
Jean-Baptiste Queru [Thu, 12 Jan 2012 22:07:20 +0000 (14:07 -0800)]
Merge "Remove mention of layoutopt/uix as they are gone."
Glenn Kasten [Thu, 12 Jan 2012 18:14:23 +0000 (10:14 -0800)]
Merge "Fix build warning"
The Android Open Source Project [Thu, 12 Jan 2012 16:58:04 +0000 (08:58 -0800)]
am
6019f7b0: Reconcile with ics-mr1-release
* commit '
6019f7b0954cdf2e9063087c94f825778a6feda0':
IMM11
The Android Open Source Project [Thu, 12 Jan 2012 16:56:04 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf
Glenn Kasten [Thu, 12 Jan 2012 15:30:27 +0000 (07:30 -0800)]
Fix build warning
Change-Id: I1e3a76e4bdae5eec4f75c5d8eb9f533afab6d140
Xavier Ducrohet [Thu, 12 Jan 2012 02:07:31 +0000 (18:07 -0800)]
Remove mention of layoutopt/uix as they are gone.
The Android Automerger [Thu, 12 Jan 2012 00:31:51 +0000 (16:31 -0800)]
IMM11
The Android Automerger [Thu, 12 Jan 2012 00:27:43 +0000 (16:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Brian Muramatsu [Wed, 11 Jan 2012 19:32:17 +0000 (11:32 -0800)]
Merge "Avoid Rebuilding Core and VMTest Descriptions"
Jean-Baptiste Queru [Wed, 11 Jan 2012 17:04:25 +0000 (09:04 -0800)]
Merge "Revert "Reference new location of SDK toolchain""
Jean-Baptiste Queru [Wed, 11 Jan 2012 17:00:41 +0000 (09:00 -0800)]
Revert "Reference new location of SDK toolchain"
This reverts commit
1b834c6660c80d376151e977466e1622b67a2af0.
Conley Owens [Wed, 11 Jan 2012 16:36:23 +0000 (08:36 -0800)]
Merge "Add a module_path_check for vendor files"
Jean-Baptiste Queru [Wed, 11 Jan 2012 14:36:55 +0000 (06:36 -0800)]
Merge "Reference new location of SDK toolchain"
Jean-Baptiste Queru [Wed, 11 Jan 2012 12:23:06 +0000 (04:23 -0800)]
Revert "Point arm toolchain to the new gcc-4.6 one."
This reverts commit
1f87795eef3ab5f63675dc6e01f304d1a6e46d2a.
Scott Main [Wed, 11 Jan 2012 01:18:50 +0000 (17:18 -0800)]
am
5c267863: am
f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
* commit '
5c26786314c934819d460fb565be200ee8894ed0':
docs: add css for Android Design links and add link to site header
Scott Main [Wed, 11 Jan 2012 01:16:53 +0000 (17:16 -0800)]
am
f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
* commit '
f962eb101b21814556f4edeb7128508d47cf5564':
docs: add css for Android Design links and add link to site header
Scott Main [Wed, 11 Jan 2012 01:14:34 +0000 (17:14 -0800)]
Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
Vladimir Chtchetkine [Wed, 11 Jan 2012 00:44:44 +0000 (16:44 -0800)]
am
02169251: (-s ours) am
2cbcd24b: Cherry-picked from
e6b969f3b in Do not merge.
* commit '
021692515734748c2632ce7a59fceed40a5eb9b6':
Cherry-picked from
e6b969f3b in master. Do not merge.
Vladimir Chtchetkine [Wed, 11 Jan 2012 00:42:47 +0000 (16:42 -0800)]
am
2cbcd24b: Cherry-picked from
e6b969f3b in Do not merge.
* commit '
2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
Cherry-picked from
e6b969f3b in master. Do not merge.
Vladimir Chtchetkine [Tue, 13 Dec 2011 19:31:54 +0000 (11:31 -0800)]
Cherry-picked from
e6b969f3b in Do not merge.
Add boot property enabling ADBD over QEMU
Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.
Change-Id: I978489c5acf46177b520e775d745bcc78f469837
Conley Owens [Tue, 10 Jan 2012 23:10:21 +0000 (15:10 -0800)]
Add a module_path_check for vendor files
When this is enabled we ensure that files from the vendor directory
get installed to /system/vendor/* instead of elsewhere in /system/*.
This changes the PRODUCT_RESTRICT_VENDOR_FILES variable
to accept "owner", "path", "owner path", or "all".
"true" will still only enforce vendor file owner restrictions.
Change-Id: I4598130a590ad56976e011f4cb2a9f5f227d5732
Scott Main [Tue, 10 Jan 2012 17:59:22 +0000 (09:59 -0800)]
docs: add css for Android Design links and add link to site header
Change-Id: I0a9469519076b1c5b9d7c121df1f2c731a08d2cb
Jean-Baptiste Queru [Mon, 9 Jan 2012 23:07:59 +0000 (15:07 -0800)]
Reference new location of SDK toolchain
Change-Id: If470d742a92061006d94b72f21df5c642348e179
Jean-Baptiste Queru [Mon, 9 Jan 2012 21:02:03 +0000 (13:02 -0800)]
Reference x86 toolchain in its new location
Change-Id: I990b03107d1596a87a8d4cea6973735c60db4c64
Ying Wang [Mon, 9 Jan 2012 19:52:23 +0000 (11:52 -0800)]
Reference the new prebuilt ccache location.
Change-Id: I4450a8254fe82ed3a670ce653f49381d9c075c8e
Steve Block [Sun, 8 Jan 2012 10:18:46 +0000 (10:18 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug:
5449033
Change-Id: Ieea4e4511e1a95caeea42cd0a0c1147ebf9c2f48
Jing Yu [Sat, 7 Jan 2012 04:29:15 +0000 (20:29 -0800)]
Merge "Point arm toolchain to the new gcc-4.6 one."
The Android Open Source Project [Sat, 7 Jan 2012 02:16:25 +0000 (18:16 -0800)]
am
2921f03d: Reconcile with ics-mr1-release
* commit '
2921f03d716f2aeb52712a81faaf7dfb597d0826':
IMM06
The Android Open Source Project [Sat, 7 Jan 2012 02:14:56 +0000 (18:14 -0800)]
Reconcile with ics-mr1-release
Change-Id: I6903bc47ab690fd56612f4e0e6289bf7a9799dca
Jean-Baptiste Queru [Sat, 7 Jan 2012 01:41:07 +0000 (17:41 -0800)]
am
9caacbd7: am
5ea72eff: Use the new location of the emulator kernel
* commit '
9caacbd74328624dfc753cecfc42cb29bf14bfad':
Use the new location of the emulator kernel
Jean-Baptiste Queru [Sat, 7 Jan 2012 01:37:02 +0000 (17:37 -0800)]
am
5ea72eff: Use the new location of the emulator kernel
* commit '
5ea72effbd944891708d2d6fb61055830e617701':
Use the new location of the emulator kernel
Jean-Baptiste Queru [Sat, 7 Jan 2012 00:44:06 +0000 (16:44 -0800)]
Use the new location of the emulator kernel
The Android Automerger [Sat, 7 Jan 2012 00:34:51 +0000 (16:34 -0800)]
IMM06
The Android Automerger [Sat, 7 Jan 2012 00:31:06 +0000 (16:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:22:50 +0000 (15:22 -0800)]
am
da1c81ab: am
a230c4d0: Reference kernel notice in the new location
* commit '
da1c81abe48c76f59953fd2e14a2ae2283d7bf92':
Reference kernel notice in the new location
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:18:21 +0000 (15:18 -0800)]
am
a230c4d0: Reference kernel notice in the new location
* commit '
a230c4d049258915f6614e7a3fadc2dcfec3e160':
Reference kernel notice in the new location
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:05:53 +0000 (15:05 -0800)]
Reference kernel notice in the new location
Jing Yu [Fri, 6 Jan 2012 22:14:06 +0000 (14:14 -0800)]
Point arm toolchain to the new gcc-4.6 one.
Tested build mysid-eng, sojus-eng, trygon-eng, yakju-eng.
Change-Id: I742cf9fcf2407b9098c99136d67161ecf062ac01
Conflicts:
core/combo/TARGET_linux-arm.mk
Ying Wang [Fri, 6 Jan 2012 19:59:30 +0000 (11:59 -0800)]
Include toolchain makefile based on the current config.
So we can have the same set of module names in different host arch
/ toolchain version combinations.
Change-Id: Iec66584bf3de92aedd71a59f9dbe74b6ed025b2e
Brian Muramatsu [Fri, 6 Jan 2012 02:24:43 +0000 (18:24 -0800)]
Avoid Rebuilding Core and VMTest Descriptions
Only generate the core test and vmtest descriptions when something has
actually changed rather than everytime CTS is built. This should make
iterative test development in CTS more pleasant.
The rule targets are changed to be the paths of the test description
XML files in a separate directory outside of the CTS distribution.
The buildCts.py rule copies these XMLs when they change to the
final CTS distribution location and creates the final plan file.
The dependencies have also been changed to reply upon the full
package paths rather than their phony targets to avoid rebuilding
everything all the time.
Finally, the AppSecurity rule was removed, because I have taken
care of that in my prior change to the Makefiles in the CTS
project.
Change-Id: I88b92c7a4cb4c2c2e20f06641e7ba0604d37f805
Steve Block [Thu, 5 Jan 2012 23:28:01 +0000 (23:28 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug:
5449033
Change-Id: I817c12b1e97bee598097d02c70d509f7ab70576a
Steve Block [Thu, 5 Jan 2012 22:08:39 +0000 (14:08 -0800)]
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
Jeff Davidson [Thu, 5 Jan 2012 20:58:04 +0000 (12:58 -0800)]
Add hm/hmm/hmmm command.
Everyone always mixes up m/mm/mmm and may not know about the "help"
command; this seems to be a nice way to remind yourself. :)
Change-Id: I009c7f7891768a8605c06e8d16384a812e607438
The Android Open Source Project [Thu, 5 Jan 2012 20:08:33 +0000 (12:08 -0800)]
am
943f9a58: Reconcile with ics-mr1-release
* commit '
943f9a58a3eb3240c8a85efa49a25a77282f5d48':
IMM04
Al Sutton [Thu, 5 Jan 2012 20:08:29 +0000 (12:08 -0800)]
am
1964c8ed: am
d8765f0f: am
80cfc37d: Partial fix for emulator under Lion.
* commit '
1964c8ed2d6b1981ee991b5ecd95ab711affdf62':
Partial fix for emulator under Lion.
Ed Heyl [Thu, 5 Jan 2012 20:08:27 +0000 (12:08 -0800)]
am
6a203293: Merge commit \'
9a46327e\' into ics-mr1-plus-aosp
* commit '
6a203293681df031b6a47f2f189d4d9d44d18576':
increment version to 4.0.4
The Android Open Source Project [Thu, 5 Jan 2012 15:45:15 +0000 (07:45 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iaa3637a3db5b9f2c8c4721a8ea2cb230336753f5
Al Sutton [Thu, 5 Jan 2012 04:41:53 +0000 (20:41 -0800)]
am
d8765f0f: am
80cfc37d: Partial fix for emulator under Lion.
* commit '
d8765f0f843e78c691c77264619125954d710b1a':
Partial fix for emulator under Lion.
Al Sutton [Thu, 5 Jan 2012 04:40:35 +0000 (20:40 -0800)]
am
80cfc37d: Partial fix for emulator under Lion.
* commit '
80cfc37d0f0ddbb7db09b7662b84e816ab409537':
Partial fix for emulator under Lion.
The Android Automerger [Thu, 5 Jan 2012 00:45:21 +0000 (16:45 -0800)]
IMM04
Ed Heyl [Thu, 5 Jan 2012 00:42:14 +0000 (16:42 -0800)]
Merge commit '
9a46327e' into ics-mr1-plus-aosp
The Android Automerger [Thu, 5 Jan 2012 00:41:01 +0000 (16:41 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Ed Heyl [Thu, 5 Jan 2012 00:34:18 +0000 (16:34 -0800)]
increment version to 4.0.4
Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
Al Sutton [Wed, 4 Jan 2012 23:16:50 +0000 (15:16 -0800)]
Partial fix for emulator under Lion.
Don't use -Wl,-dynamic on Lion
Steve Block [Wed, 4 Jan 2012 20:07:45 +0000 (20:07 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug:
5449033
Change-Id: I02566a8d55d7f8845bcc11925b90b2dac4342e63
Steve Block [Tue, 20 Dec 2011 16:25:43 +0000 (16:25 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug:
5449033
Change-Id: I9281fd27af8c6ec29ebdca60b22f6c9d5ff8deed
Ying Wang [Tue, 3 Jan 2012 19:52:26 +0000 (11:52 -0800)]
Default LOCAL_SDK_RES_VERSION to LOCAL_SDK_VERSION
in static_java_library.mk.
Change-Id: I25ad47fea0fdb10c8aa0a0cb0d4c5ed117cd76ef
Jean-Baptiste Queru [Wed, 28 Dec 2011 23:42:40 +0000 (15:42 -0800)]
Add CSR to the list of known vendors
Change-Id: I978569e1be4c9d1d52d2b7fb7de2da4d4f616f39
Conley Owens [Tue, 27 Dec 2011 18:28:10 +0000 (10:28 -0800)]
am
f3c068db: (-s ours) am
d38c870d: Get build system to work with Make 3.82
* commit '
f3c068db26fd1c862f06423714aadf75bf45136b':
Get build system to work with Make 3.82
Ying Wang [Fri, 23 Dec 2011 01:40:05 +0000 (17:40 -0800)]
Remove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULES
Change-Id: I33e776ea80368e0f0290169e680689a680186ed6
Conley Owens [Fri, 23 Dec 2011 00:52:42 +0000 (16:52 -0800)]
am
d38c870d: Get build system to work with Make 3.82
* commit '
d38c870d2e168b051692b20ade0fc966c9e2daf7':
Get build system to work with Make 3.82
Conley Owens [Thu, 22 Dec 2011 17:46:19 +0000 (09:46 -0800)]
Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.
Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
Conley Owens [Thu, 22 Dec 2011 23:14:01 +0000 (15:14 -0800)]
Merge "Get build system to work with Make 3.82"
Tor Norbye [Thu, 22 Dec 2011 20:13:15 +0000 (12:13 -0800)]
Merge "Make asm-3.1 an optional module, remove from grandfathered list"
Conley Owens [Thu, 22 Dec 2011 17:46:19 +0000 (09:46 -0800)]
Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.
Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
Ying Wang [Thu, 22 Dec 2011 02:54:36 +0000 (18:54 -0800)]
We should include factory ramdisk if one shot makefile is NOT defined.
Change-Id: I711dbfb0d98a5e8a4d784d3ee6f3f9cfdc926209
Al Sutton [Thu, 22 Dec 2011 00:46:37 +0000 (16:46 -0800)]
am
657aeac8: am
9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '
657aeac8423d9e3cd31c0dffcecaad78a53d7604':
Don't run ranlib on MacOS 10.7
Atte Peltomaki [Thu, 22 Dec 2011 00:46:36 +0000 (16:46 -0800)]
am
05e98055: am
60fe963c: build: explicitly define dependency files
* commit '
05e98055fdb1d48bac80790cb719838598b687e8':
build: explicitly define dependency files
Al Sutton [Thu, 22 Dec 2011 00:45:21 +0000 (16:45 -0800)]
am
9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '
9ce06f11d69f5154843c234fe0624f9e70d39359':
Don't run ranlib on MacOS 10.7
Atte Peltomaki [Thu, 22 Dec 2011 00:45:20 +0000 (16:45 -0800)]
am
60fe963c: build: explicitly define dependency files
* commit '
60fe963c63c1b98255ad1cf40573b81b5d90d9c3':
build: explicitly define dependency files
Ying Wang [Thu, 22 Dec 2011 00:24:43 +0000 (16:24 -0800)]
Merge "Disable factory ramdisk if build with mm/mmm"
Ying Wang [Thu, 22 Dec 2011 00:20:12 +0000 (16:20 -0800)]
Disable factory ramdisk if build with mm/mmm
Because factory ramdisk build depends on the global view of all modules.
Change-Id: I5b35821cd287b70702191f3c30be6735d3339544
Raphael [Wed, 21 Dec 2011 23:02:44 +0000 (15:02 -0800)]
Merge "Allow make 3.82 to be used under Cygwin 1.7"
Raphael [Wed, 21 Dec 2011 23:02:38 +0000 (15:02 -0800)]
Merge "Add 2 SDK directories that can build under Cygwin/Mingw"
Ying Wang [Wed, 21 Dec 2011 19:30:59 +0000 (11:30 -0800)]
Fix multiple modules with the same name in FACTORY_RAMDISK_MODULES
With this change, if a module name is associated with multiple modules,
you can specify multiple install paths in
PRODUCT_FACTORY_RAMDISK_MODULES.
For example, if we have 2 modules named "foo", one is Java library and
the other is executable, then you can write:
PRODUCT_FACTORY_RAMDISK_MODULES += \
foo:system/bin/foo:system/framework/foo.jar
Or:
PRODUCT_FACTORY_RAMDISK_MODULES += \
foo:system/bin/foo \
foo:system/framework/foo.jar
The build system will choose the correct built files based on the
install paths.
Change-Id: I6efc72e8abd1e81710ada16731b6792989aefd85
Al Sutton [Wed, 21 Dec 2011 21:12:05 +0000 (13:12 -0800)]
Don't run ranlib on MacOS 10.7
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
Atte Peltomaki [Wed, 21 Dec 2011 17:24:09 +0000 (09:24 -0800)]
build: explicitly define dependency files
Groundwork for distcc support in Android build system,
see distcc FAQ for details on why -MF is needed:
http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
The Android Open Source Project [Wed, 21 Dec 2011 15:21:38 +0000 (07:21 -0800)]
am
a4b72c9f: Reconcile with ics-mr1-release
* commit '
a4b72c9fe4ea6e984440d67538eee26fdb140d8d':
IML81
The Android Open Source Project [Wed, 21 Dec 2011 15:19:13 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release
Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7
Ying Wang [Wed, 21 Dec 2011 01:36:42 +0000 (17:36 -0800)]
Merge "Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES"
Ying Wang [Wed, 21 Dec 2011 01:25:31 +0000 (17:25 -0800)]
Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES
If there is shared library with the same name.
Change-Id: Iaa43219cab7737c02a79d168f13ad4c473421f24
The Android Automerger [Wed, 21 Dec 2011 01:29:41 +0000 (17:29 -0800)]
IML81
The Android Automerger [Wed, 21 Dec 2011 01:26:02 +0000 (17:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 20 Dec 2011 21:09:52 +0000 (13:09 -0800)]
am
b08c5647: Reconcile with ics-mr1-release
* commit '
b08c5647a42d07d905823ccf2a88a3a8051af006':
IML77B
IML77
The Android Open Source Project [Tue, 20 Dec 2011 21:08:24 +0000 (13:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9
Raphael [Mon, 19 Dec 2011 21:37:55 +0000 (13:37 -0800)]
Allow make 3.82 to be used under Cygwin 1.7
OTOH, should we just allow the expression to be >= 3.81
for all platforms? For cygwin it's a specific case since
we don't build the platform, only a handful set of tools
and it works just fine with a newer make 3.82.
Change-Id: Icff0d0e13bce79f7164007985f14db56e9049552
Raphael [Mon, 19 Dec 2011 21:27:11 +0000 (13:27 -0800)]
Add 2 SDK directories that can build under Cygwin/Mingw
Change-Id: I020c2691d7d92a48bd406360e2752357ae79e3b0
Bruce Beare [Mon, 19 Dec 2011 19:38:37 +0000 (11:38 -0800)]
am
b056d71f: If setupwizard is disabled, don\'t force it to optional
* commit '
b056d71f79b717fb36d375e48c19509900f977d3':
If setupwizard is disabled, don't force it to optional
Bruce Beare [Thu, 1 Dec 2011 20:46:12 +0000 (12:46 -0800)]
If setupwizard is disabled, don't force it to optional
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Glenn Kasten [Mon, 19 Dec 2011 16:07:56 +0000 (08:07 -0800)]
Merge "Add libaudioutils"
The Android Automerger [Sun, 18 Dec 2011 01:30:21 +0000 (17:30 -0800)]
IML77B
Ying Wang [Sat, 17 Dec 2011 01:00:46 +0000 (17:00 -0800)]
Merge "Collect the GPL source files."
Glenn Kasten [Fri, 16 Dec 2011 23:34:57 +0000 (15:34 -0800)]
Add libaudioutils
Change-Id: I8fe062e4a78d8db1ce0612bf7cb58dc021925810
Ying Wang [Fri, 16 Dec 2011 19:27:52 +0000 (11:27 -0800)]
Support to build factory ramdisk image.
Bug:
5769921
With this change, to build factory_ramdisk.img, set
PRODUCT_FACTORY_RAMDISK_MODULES in your product config.
PRODUCT_FACTORY_RAMDISK_MODULES consists of
"<module_name>:<install_path>" pairs.
<install_path> is relative to the root of the factory ramdisk output.
For example:
PRODUCT_FACTORY_RAMDISK_MODULES := \
toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb
On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files
to the factory ramdisk.
Or you can define modules that are specific for the factory ramdisk
(with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add
the module names to PRODUCT_PACKAGES.
Change-Id: I80ff72606415cd74fe6f3bc93020a05d84e45b70
Ying Wang [Fri, 16 Dec 2011 21:52:26 +0000 (13:52 -0800)]
Merge "Print out ignored PRODUCT_COPY_FILES"