Commit graph

7605 commits

Author SHA1 Message Date
Steve Block
934443b275 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
2012-01-04 20:07:45 +00:00
Steve Block
15fab1aa8c 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
2012-01-03 22:37:53 +00:00
Ying Wang
aaa8f06fe3 Default LOCAL_SDK_RES_VERSION to LOCAL_SDK_VERSION
in static_java_library.mk.

Change-Id: I25ad47fea0fdb10c8aa0a0cb0d4c5ed117cd76ef
2012-01-03 11:52:26 -08:00
Jean-Baptiste Queru
89fbc541ad Add CSR to the list of known vendors
Change-Id: I978569e1be4c9d1d52d2b7fb7de2da4d4f616f39
2011-12-28 15:42:40 -08:00
Conley Owens
fd3e1f9bf1 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
2011-12-27 10:28:10 -08:00
Ying Wang
29b6918fdd Remove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULES
Change-Id: I33e776ea80368e0f0290169e680689a680186ed6
2011-12-22 17:51:28 -08:00
Conley Owens
f3c068db26 am d38c870d: Get build system to work with Make 3.82
* commit 'd38c870d2e168b051692b20ade0fc966c9e2daf7':
  Get build system to work with Make 3.82
2011-12-22 16:52:42 -08:00
Conley Owens
d38c870d2e Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
2011-12-22 15:16:05 -08:00
Conley Owens
015c7885e0 Merge "Get build system to work with Make 3.82" 2011-12-22 15:14:01 -08:00
Tor Norbye
4630c32189 Merge "Make asm-3.1 an optional module, remove from grandfathered list" 2011-12-22 12:13:15 -08:00
Conley Owens
d7a1a9b49b Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
2011-12-22 09:56:18 -08:00
Ying Wang
4c54b9fa2a We should include factory ramdisk if one shot makefile is NOT defined.
Change-Id: I711dbfb0d98a5e8a4d784d3ee6f3f9cfdc926209
2011-12-21 18:59:40 -08:00
Al Sutton
a4f5991486 am 657aeac8: am 9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '657aeac8423d9e3cd31c0dffcecaad78a53d7604':
  Don't run ranlib on MacOS 10.7
2011-12-21 16:46:37 -08:00
Atte Peltomaki
5846050fd4 am 05e98055: am 60fe963c: build: explicitly define dependency files
* commit '05e98055fdb1d48bac80790cb719838598b687e8':
  build: explicitly define dependency files
2011-12-21 16:46:36 -08:00
Al Sutton
657aeac842 am 9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '9ce06f11d69f5154843c234fe0624f9e70d39359':
  Don't run ranlib on MacOS 10.7
2011-12-21 16:45:21 -08:00
Atte Peltomaki
05e98055fd am 60fe963c: build: explicitly define dependency files
* commit '60fe963c63c1b98255ad1cf40573b81b5d90d9c3':
  build: explicitly define dependency files
2011-12-21 16:45:20 -08:00
Ying Wang
c26f4d3904 Merge "Disable factory ramdisk if build with mm/mmm" 2011-12-21 16:24:43 -08:00
Ying Wang
9f0e3c9658 Disable factory ramdisk if build with mm/mmm
Because factory ramdisk build depends on the global view of all modules.

Change-Id: I5b35821cd287b70702191f3c30be6735d3339544
2011-12-21 16:24:30 -08:00
Raphael
fe927e18a6 Merge "Allow make 3.82 to be used under Cygwin 1.7" 2011-12-21 15:02:44 -08:00
Raphael
d44d54a0d9 Merge "Add 2 SDK directories that can build under Cygwin/Mingw" 2011-12-21 15:02:38 -08:00
Ying Wang
931a099a4c 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
2011-12-21 13:50:06 -08:00
Al Sutton
9ce06f11d6 Don't run ranlib on MacOS 10.7
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
2011-12-21 13:12:33 -08:00
Atte Peltomaki
60fe963c63 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
2011-12-21 09:24:09 -08:00
The Android Open Source Project
0c357453ff am a4b72c9f: Reconcile with ics-mr1-release
* commit 'a4b72c9fe4ea6e984440d67538eee26fdb140d8d':
  IML81
2011-12-21 07:21:38 -08:00
The Android Open Source Project
a4b72c9fe4 Reconcile with ics-mr1-release
Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7
2011-12-21 07:19:13 -08:00
Ying Wang
a729528651 Merge "Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES" 2011-12-20 17:36:42 -08:00
Ying Wang
0d75a0a54c Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES
If there is shared library with the same name.

Change-Id: Iaa43219cab7737c02a79d168f13ad4c473421f24
2011-12-20 17:36:26 -08:00
The Android Automerger
457b7f38a5 IML81 2011-12-20 17:29:41 -08:00
The Android Automerger
ce37741314 merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:26:02 -08:00
The Android Open Source Project
be47fc177d am b08c5647: Reconcile with ics-mr1-release
* commit 'b08c5647a42d07d905823ccf2a88a3a8051af006':
  IML77B
  IML77
2011-12-20 13:09:52 -08:00
The Android Open Source Project
b08c5647a4 Reconcile with ics-mr1-release
Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9
2011-12-20 13:08:24 -08:00
Raphael
76bf62d75e 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
2011-12-19 13:39:51 -08:00
Raphael
0ae6d29568 Add 2 SDK directories that can build under Cygwin/Mingw
Change-Id: I020c2691d7d92a48bd406360e2752357ae79e3b0
2011-12-19 13:39:43 -08:00
Bruce Beare
cf0b20413e am b056d71f: If setupwizard is disabled, don\'t force it to optional
* commit 'b056d71f79b717fb36d375e48c19509900f977d3':
  If setupwizard is disabled, don't force it to optional
2011-12-19 11:38:37 -08:00
Bruce Beare
b056d71f79 If setupwizard is disabled, don't force it to optional
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-19 09:51:40 -08:00
Glenn Kasten
dd7fce30df Merge "Add libaudioutils" 2011-12-19 08:07:56 -08:00
The Android Automerger
e521822eb2 IML77B 2011-12-17 17:30:21 -08:00
Ying Wang
4b9d4ea2e2 Merge "Collect the GPL source files." 2011-12-16 17:00:46 -08:00
Glenn Kasten
d1ee208e4a Add libaudioutils
Change-Id: I8fe062e4a78d8db1ce0612bf7cb58dc021925810
2011-12-16 15:39:33 -08:00
Ying Wang
89686538d7 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
2011-12-16 13:54:10 -08:00
Ying Wang
1eed1cd429 Merge "Print out ignored PRODUCT_COPY_FILES" 2011-12-16 13:52:26 -08:00
Brian Muramatsu
5fc0057b7d Stop Building CTS VM Tests
Bug 5728172

The VM tests were used with the old test runner.

Change-Id: I7ba819a394bb9643f937240ebd315d7d7820a8bf
2011-12-16 13:07:15 -08:00
The Android Automerger
cc8efd02cc IML77 2011-12-16 12:02:53 -08:00
The Android Automerger
16e1f203dd merge in ics-mr1-release history after reset to ics-mr1 2011-12-16 12:01:24 -08:00
Ying Wang
193010cc8f Print out ignored PRODUCT_COPY_FILES
So that people know their files are not really copied in accident.

Change-Id: I8fab920483230a9f349304dcbdb2fb9d60ee0215
2011-12-16 11:56:24 -08:00
Kenny Root
02687855ca Merge "Unset HAVE_TLS_REGISTER for ARMv5" 2011-12-16 09:27:17 -08:00
The Android Open Source Project
b904ac2166 am 6c2c5d8e: Reconcile with ics-mr1-release
* commit '6c2c5d8eec5e140ebedee7330988015df6aeb8bc':
  IML74K
  IML74J
  IML74I
  IML74H
  IML75
2011-12-16 08:09:52 -08:00
The Android Open Source Project
6c2c5d8eec Reconcile with ics-mr1-release
Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7
2011-12-16 08:07:59 -08:00
The Android Automerger
a9819e2ff1 IML74K 2011-12-16 00:15:10 -08:00
The Android Automerger
e9db408701 IML74J 2011-12-15 21:43:32 -08:00