Commit graph

284 commits

Author SHA1 Message Date
Colin Cross
b7fc1545f3 Add gcc_demangle to BUILD_TINY_ANDROID projects
libgccdemangle.so is required to build libcorkscrew, which is in
system/core and built when BUILD_TINY_ANDROID is set.

Change-Id: Ide9af58cfc075e27a7368993b29be2c0e53275a8
2012-02-06 18:47:00 -08:00
Raphael Moll
347f305181 Move Windows SDK whitelist out of main.mk
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.

Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git

Change-Id: Id6178b000c464c989da2c7f22977986a60de1f44
2012-01-26 15:11:46 -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
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
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
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
9f8e8db188 Build cache.img on demand
Bug: 5153694
To build cache.img, set BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE (required,
ext4 only for now), BOARD_CACHEIMAGE_PARTITION_SIZE (optional) in
BoardConfig.mk.

Change-Id: I1d8b91646aa1dba88285e008ad3335768bcbddd2
2011-11-10 14:30:34 -08:00
Ying Wang
c0debb9b5e Revert "Build cache.img."
This reverts commit 531bdb546a.
2011-11-02 11:19:28 -07:00
Ying Wang
531bdb546a Build cache.img.
Change-Id: I3dbe7afa4934fa718ba20605eebd2e3ce2ae82ab
2011-11-01 10:44:19 -07:00
Xavier Ducrohet
3282e9bb4d Remove references to layoutopt from the build.
Change-Id: I54a41f47a380531f4b50eb26e67e8f52b63269a5
2011-10-26 16:47:40 -07:00
Omari Stephens
65216a2d3b Revert "Remove layoutopt; replaced by the more generic "lint" tool."
This reverts commit 7a23d45cdc.
2011-10-26 16:14:56 -07:00
Tor Norbye
7a23d45cdc Remove layoutopt; replaced by the more generic "lint" tool.
Change-Id: I5754d10ec7b3fd03a2eb9a70e5f73201f909e11e
2011-10-26 13:37:59 -07:00
Tor Norbye
4377cc701a Build fix - include sdk/lint in build
Change-Id: Id65b7a3f72dd6c5104738fa872f3beb029d91163
2011-10-20 19:21:30 -07:00
Ying Wang
486be82198 Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds
Bug: 5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
  already inherit from generic.mk.

Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d
2011-10-10 13:10:13 -07:00
Raphael
c36df7b12b Enable building sdk/avdlauncher in the Win SDK.
Required by Change-Id Ic651e3c3 in sdk.git

Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
2011-09-16 09:20:03 -07:00
Raphael
1518506345 Enable 'make traceview' under Windows.
Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
2011-09-06 16:39:37 -07:00
David 'Digit' Turner
9d99d7dfb8 resolved conflicts for merge of 6da54b6e to master
Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
2011-08-26 00:53:34 +02:00
David 'Digit' Turner
6da54b6e0e resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
2011-08-25 23:23:32 +02:00
Jean-Baptiste Queru
d7d096df71 Tighten the toolchain version check
Bug: 3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
2011-08-25 11:29:54 -07:00
David 'Digit' Turner
43dd89d2a0 emulator: Enable GLES emulation libraries
This patch enables the build of OpenGLES emulation libraries
(both in the guest and the host) for any emulator-specific
product config.

+ update core/main.mk to ensure that the right path is parsed
  when building the Windows SDK

Change-Id: Ifde047f8c0ef922504a7286c8c5b57f7c79c71f8
2011-08-23 22:25:13 +02:00
Raphael Moll
88833405c4 am cfdfad3f: am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."
* commit 'cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef':
  Add sdk/rule_api to the Windows build paths.
2011-08-17 11:36:25 -07:00
Raphael Moll
cfdfad3fca am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."
* commit '807c79802d5e8b1613bf36bb780cf3250f443aa2':
  Add sdk/rule_api to the Windows build paths.
2011-08-17 11:29:48 -07:00
Raphael Moll
408c7f8a8f Add sdk/rule_api to the Windows build paths.
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
2011-08-16 19:40:03 -07:00
Brian Swetland
d1975a2946 fix tiny android builds (add mksh)
Change-Id: I0cf5068b6e9b350259009c5ecf7f2946d05f7b2d
2011-08-16 16:15:26 -07:00
Raphael Moll
b194b9d185 am dd9e8477: am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit 'dd9e8477e6cc1a8de556dd7942fb81c049e2e373':
  Add sdk/assetstudio to the Windows build paths.
2011-07-29 14:34:01 -07:00
Raphael Moll
dd9e8477e6 am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit '266a571fbd557c402e937130922ced8c523dd451':
  Add sdk/assetstudio to the Windows build paths.
2011-07-29 13:59:23 -07:00
Raphael Moll
667ec86a33 Add sdk/assetstudio to the Windows build paths.
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
2011-07-29 13:04:53 -07:00
Mike Lockwood
40b5a67ecd Remove obsolete persist.service.adb.enable property from default.prop
Change-Id: I59a2da01eddfc1fa775e027a86f7f818a146a6b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-01 12:31:47 -04:00
David 'Digit' Turner
0ef25320d5 am a85ebfb0: am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit 'a85ebfb059080865a549539a9d2758c4e8b8aeed':
  Turn-off implicit GNU Make RC/SCCS rules
2011-06-23 14:29:59 -07:00
David 'Digit' Turner
a85ebfb059 am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit 'fa112f982241fc3efa0129094e87a34f2317f41e':
  Turn-off implicit GNU Make RC/SCCS rules
2011-06-22 18:05:06 -07:00
David 'Digit' Turner
52d697d432 Turn-off implicit GNU Make RC/SCCS rules
This small patch prevents GNU Make from stating RCS and SCCS
specific files on the filesystem. This makes the output of
"make -d" slightly more readable, and also reduces the no-change
time on AOSP master by a bit less than a second on average.

Change-Id: Ifa50ace32e8689717956d7247b0d6f53ef72b7a1
2011-06-22 23:18:57 +02:00
Ying Wang
2914f7f3b3 Relax the constraint of 64bit build environment.
Change-Id: Id349f424b122816f42c99769b629a9447986cf20
2011-06-17 11:18:10 -07:00
Jean-Baptiste Queru
70776231ee am 45a3ad7d: Merge c1efb060
* commit '45a3ad7d225495367a47440da118609b4940fe71':
  Relax the constraint of 64bit build environment.
2011-06-07 18:20:25 -07:00
Jean-Baptiste Queru
45a3ad7d22 Merge c1efb060
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
2011-06-07 13:10:06 -07:00
Jean-Baptiste Queru
c1efb06045 am 3c60c67a: Merge from open-source gingerbread
* commit '3c60c67ad2a157f5bfb731accfc74f5b42c69851':
  Relax the constraint of 64bit build environment.
2011-06-01 08:07:56 -07:00
Dan Bornstein
f7ad63ae65 Clean up how dex preoptimization gets configured.
Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5
2011-05-31 10:36:55 -07:00
Ying Wang
053dccb159 Relax the constraint of 64bit build environment.
Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
2011-05-24 15:46:15 -07:00
Raphael Moll
e480e7fd89 am 009e6022: am cb6a22f5: am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit '009e602275e39fccbd6de52534621f6ceeaae001':
  Allow swtmenubar module to be buildable on Windows.
2011-04-15 17:33:20 -07:00
Raphael Moll
009e602275 am cb6a22f5: am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit 'cb6a22f591d66443c923ad917f6d40e943b476ce':
  Allow swtmenubar module to be buildable on Windows.
2011-04-15 17:28:36 -07:00
Raphael Moll
cb6a22f591 am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit '2e4e3c94211fd31962e8fd1c6152932bbfdea7d5':
  Allow swtmenubar module to be buildable on Windows.
2011-04-15 14:56:41 -07:00
Raphael Moll
59ad18fa49 Allow swtmenubar module to be buildable on Windows.
Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
2011-04-14 21:25:44 -07:00
Ying Wang
c3dd0e62c0 am bdbcc65d: am 7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.
* commit 'bdbcc65d0ee98187f447bc2ae3b421dd2ffd0540':
  Drop using vendor/google/etc/apns-conf.xml for eng builds.
2011-04-13 10:34:14 -07:00
Ying Wang
bdbcc65d0e am 7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.
* commit '7c1a1247f3e7110a95696671e8f71334e9b3c1b5':
  Drop using vendor/google/etc/apns-conf.xml for eng builds.
2011-04-13 10:31:50 -07:00
Ying Wang
7c1a1247f3 Drop using vendor/google/etc/apns-conf.xml for eng builds.
Bug: 4133493
Change-Id: I3eee2a5658620f480370d260b395e928bc395886
2011-04-13 10:18:12 -07:00
Ying Wang
fdc3192e68 resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
2011-03-31 17:00:13 -07:00
Raphael
bd0c91c8b9 Merge c4d4731b4d: 'Build SDK repository'. Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I863ac8baf159432d7c95df46cba6e4f3b9122629
2011-03-24 13:41:35 -07:00