tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16036 commits 1 branch 0 tags 119 MiB
Commit graph

4249 commits

Author SHA1 Message Date
Ying Wang
f3ba9484b5 Remove external/tcpdump from 64-bit build blacklist. 
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
 2014-03-13 11:26:26 -07:00
Elliott Hughes
1c71a43aef oprofile/daemon doesn't build for x86_64. 
We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.

Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356
 2014-03-13 11:26:26 -07:00
Ying Wang
579ea43d87 Remove external/wpa_supplicant_8 and external/android-clat 
from 64_bit_blacklist.mk.
They now build fine for 64-bit.

Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
 2014-03-13 11:26:26 -07:00
Elliott Hughes
7813000d49 Take libcore off the LP64 blacklist. 
Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
 2014-03-13 11:26:26 -07:00
Colin Cross
9bdcdff615 HACK: add 64-bit directory blacklist 
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
 2014-03-13 11:26:26 -07:00
Colin Cross
c92f1407a1 add support for module supported or unsupported target architectures 
Add four new variables for module makefiles:

LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for
one or more architectures.  Any architecture not in the list will be
not attempt to build the module.  The expected use case is prebuilts
that are only suitable for a single architecture, or modules like llvm
that need per-architecture support.

LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be
built for one or more architectures.

LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN
are the same, but warn that the arch is not supported, which is useful
for modules that are critical but not yet working.

The logic for whether or not to build an architecture is fairly
complicated, so this patch consolidates it into module_arch_supported.mk

Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
 2014-03-13 11:26:04 -07:00
Dmitriy Ivanov
96ad54d132 am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar" 
* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
  Add TARGET_2ND_ARCH to dumpvar
 2014-03-13 15:54:41 +00:00
Narayan Kamath
f262d87f01 am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist."" 
* commit '237f5414ebf38e1386307679947641f72865fc38':
  Revert "Remove external/chromium from the 64 bit blacklist."
 2014-03-13 09:33:58 +00:00
Narayan Kamath
cc8d6dab9a Merge "Revert "Remove external/chromium from the 64 bit blacklist."" 2014-03-13 09:29:52 +00:00
Narayan Kamath
c00ab8e012 Revert "Remove external/chromium from the 64 bit blacklist." 
This reverts commit 27bf51144a.

Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
 2014-03-13 09:29:22 +00:00
Narayan Kamath
f6869e25c9 am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist." 
* commit '709169725a34836b3f388526aee714f070f20103':
  Remove external/chromium from the 64 bit blacklist.
 2014-03-13 09:18:00 +00:00
Narayan Kamath
252496247f Merge "Remove external/chromium from the 64 bit blacklist." 2014-03-13 09:05:32 +00:00
Ying Wang
895520a782 am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG" 
* commit '446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
 2014-03-13 01:55:11 +00:00
Ian Rogers
bf9670a38b am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences." 
* commit '21060b30993b975084ea7a7c35a6df23cf0e5ea7':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.
 2014-03-13 01:54:43 +00:00
Ian Rogers
dae5ebc949 am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."" 
* commit 'bc39fd5cab47388797ee7638920766e91fe0b100':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
 2014-03-13 01:54:41 +00:00
Dmitriy Ivanov
7ba6258a7b am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar" 
* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
  Add TARGET_2ND_ARCH to dumpvar
 2014-03-12 18:49:19 +00:00
Dmitriy Ivanov
d5cd1e2ecf Add TARGET_2ND_ARCH to dumpvar 
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
 2014-03-12 11:13:41 -07:00
Narayan Kamath
27bf51144a Remove external/chromium from the 64 bit blacklist. 
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.

This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.

Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
 2014-03-12 14:43:38 +00:00
Andrew Hsieh
cbe162e914 Fix HOST_TOOLCHAIN_PREFIX 
Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format.  Fix it so we can try out new host toolchain, eg.

  HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make

Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
 2014-03-12 19:27:59 +08:00
Dianne Hackborn
264d4001e7 am 7503e736: 4.4.3 is MR2, version boogaloo! 
* commit '7503e736ebb0161a23ff0ee39a307cd436ea8afc':
  4.4.3 is MR2, version boogaloo!
 2014-03-11 23:22:38 +00:00
Dianne Hackborn
7503e736eb 4.4.3 is MR2, version boogaloo! 
Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
 2014-03-11 14:54:09 -07:00
Ian Rogers
7d5d35d465 am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences." 
* commit 'a520bfbeb65b307da42abb079911311096fef20c':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.
 2014-03-11 18:52:52 +00:00
Ying Wang
04691b3947 am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version" 
* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
  jdk error message should not mention the version
 2014-03-11 18:52:31 +00:00
Nicolas Geoffray
e7be6ffa98 am db48d145: am 247dd0c4: Merge "Do not remove the generated .hpp file from yacc." 
* commit 'db48d145841afb9b9b6d1c124191a1681d6b4f39':
  Do not remove the generated .hpp file from yacc.
 2014-03-11 18:29:45 +00:00
Nicolas Geoffray
6b92a7018e am b11697d3: am 68d38154: Merge "Remove host-prefix command line argument to dex2oat." 
* commit 'b11697d30778db51d476aedd28b0e2c65eb241e3':
  Remove host-prefix command line argument to dex2oat.
 2014-03-11 18:29:12 +00:00
Andrew Hsieh
f25a976fa6 am 12493c89: am 6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer" 
* commit '12493c892e59d826eec41caea6bc90a5778bb672':
  Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
 2014-03-11 18:28:59 +00:00
Nicolas Geoffray
5ebef36646 am d85ef325: am 460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files." 
* commit 'd85ef325de805996050170b3ce1cc199cba7c980':
  Extend YACC and LEX handling to .yy and .ll files.
 2014-03-11 18:28:25 +00:00
Ying Wang
009f48b00f am a6230641: am 26bcd640: Merge "Try to catch more misuse of ." 
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
  Try to catch more misuse of $(my-dir).
 2014-03-11 18:17:42 +00:00
Ying Wang
8ec7041127 am 8e286fbf: am cf1b7d4b: Merge "Select src arch for prebuilts." 
* commit '8e286fbfc712ed695008f786592fe83e4a1331a7':
  Select src arch for prebuilts.
 2014-03-11 18:16:49 +00:00
Ying Wang
9638890678 am 66a9b789: Merge "Include privileged apps with app zip file." 
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
  Include privileged apps with app zip file.
 2014-03-11 18:16:01 +00:00
Ying Wang
84ee17bd65 am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules." 
* commit 'bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
  Conditionally include the 'samplecode' rules.
 2014-03-11 18:08:18 +00:00
Torne (Richard Coles)
bbc3a3eda3 am 63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS." 
* commit '630020883abc6c8b2c13876e3195ed6abcf4890f':
  Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
 2014-03-11 18:08:03 +00:00
Ying Wang
d98291e74e am 66331624: Merge "Fix prebuilt library dependency for multilib build" 
* commit '66331624b5422a608607a9924f174ba533573032':
  Fix prebuilt library dependency for multilib build
 2014-03-11 18:07:57 +00:00
Ying Wang
64255e639b am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir" 
* commit 'f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
  Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
 2014-03-11 17:12:21 +00:00
Ying Wang
0a196075ee am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG" 
* commit '446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
 2014-03-11 02:08:45 +00:00
Ying Wang
ba8b377d89 Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG 
Still keep WITHOUT_CLANG, which enables both.

Bug: 13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
 2014-03-10 18:59:12 -07:00
Ian Rogers
9573917699 am 21060b30: am 775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences." 
* commit '21060b30993b975084ea7a7c35a6df23cf0e5ea7':
  Define __STDC_CONSTANT_MACROS globally to work around host build differences.
 2014-03-11 00:01:57 +00:00
Ian Rogers
aa54033b46 Define __STDC_CONSTANT_MACROS globally to work around host build differences. 
Change-Id: I945128b3087b28f62467c7123b759e3514027574
 2014-03-10 16:49:41 -07:00
Ian Rogers
e25c0b2599 am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."" 
* commit 'bc39fd5cab47388797ee7638920766e91fe0b100':
  Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
 2014-03-10 23:37:13 +00:00
Ian Rogers
c61a9425cd Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences." 
This reverts commit 668427c941.

Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
 2014-03-10 23:27:01 +00:00
Ian Rogers
848361f97e am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences." 
* commit 'a520bfbeb65b307da42abb079911311096fef20c':
  Define __STDC_LIMIT_MACROS globally to work around host build differences.
 2014-03-10 22:51:08 +00:00
Ian Rogers
668427c941 Define __STDC_LIMIT_MACROS globally to work around host build differences. 
Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
 2014-03-10 15:30:39 -07:00
Ying Wang
7670415852 am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version" 
* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
  jdk error message should not mention the version
 2014-03-10 19:29:36 +00:00
Chris Wren
22e3835e33 jdk error message should not mention the version 
the version is checked elsewhere

Bug: 13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
 2014-03-10 12:25:31 -07:00
Ying Wang
2c5666fc4d am eb9b62e0: Merge "Make -rpath-link work with multilib." 
* commit 'eb9b62e08d25ec9067a3f47634a2b8cf750230d8':
  Make -rpath-link work with multilib.
 2014-03-10 18:06:15 +00:00
Tim Murray
c3ba600f58 am 254a88b9: Merge "Switch to LLVM 3.4 prebuilts in AOSP." 
* commit '254a88b9578883f3138be6991c7bcdb8393af188':
  Switch to LLVM 3.4 prebuilts in AOSP.
 2014-03-10 18:06:06 +00:00
Adam Hampson
deb462442f am 57afaa53: Add init.environ.rc to installclean 
* commit '57afaa537361e7f5c12c049b13b831c1126b3cad':
  Add init.environ.rc to installclean
 2014-03-08 01:54:46 +00:00
Adam Hampson
57afaa5373 Add init.environ.rc to installclean 
BOOTCLASSPATH needs to be rebuilt when switching between build
targets.

Bug: 13282187

Change-Id: I16816abb4246878a60e1aa8c91b6b38c7339950e
Signed-off-by: Adam Hampson <ahampson@google.com>
 2014-03-07 15:55:18 -08:00
Ying Wang
f5ad2b9253 resolved conflicts for merge of 9aadde67 to klp-dev-plus-aosp 
Change-Id: I6102f1f092dd4c1d131e5cc6f4180c2fbdc93b53
 2014-03-07 15:07:51 -08:00
Ying Wang
4438454b2a am 9335001d: Merge "Strip all symbols on x86" 
* commit '9335001d5d15777522455d5f593a9a69719b12b7':
  Strip all symbols on x86
 2014-03-07 22:59:40 +00:00
Ying Wang
6df34fbc84 am e72beb53: Merge "Remove dead code." 
* commit 'e72beb53a8f0644d65c3e218677e287c109d67c6':
  Remove dead code.
 2014-03-07 22:59:37 +00:00
Ying Wang
dcbe985a6d am f9538ea6: Merge "Add missing s to mips." 
* commit 'f9538ea6261f373bdb993bc5d0a503b4ecbc0c22':
  Add missing $(combo_2nd_arch_prefix)s to mips.
 2014-03-07 19:41:11 +00:00
Ying Wang
0ee468fe30 am 5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build" 
* commit '5aa50c6637f88213661b29facaf05f072316dec0':
  Fix x86 config file to support 2nd ARCH build
 2014-03-07 19:40:41 +00:00
Ying Wang
5f6fa379bc am 3d9c1c1a: Merge "Switch x86_64 to gcc-4.8" 
* commit '3d9c1c1a537ead6071165ea661507e0a9250dc4a':
  Switch x86_64 to gcc-4.8
 2014-03-07 19:40:40 +00:00
Colin Cross
dd494f8df7 am 4febec12: Merge "x86: set -msse2 for all builds" 
* commit '4febec12272a90456c5216cc10ccc059ba11552d':
  x86: set -msse2 for all builds
 2014-03-07 19:40:12 +00:00
Narayan Kamath
a5dee12770 am 2bea94ba: Merge "Fix up android.core CTS tests." 
* commit '2bea94bac78d8a8ed5030d1e09d48db677e1167d':
  Fix up android.core CTS tests.
 2014-03-07 19:39:28 +00:00
Narayan Kamath
632e4a8edd am 70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony." 
* commit '70a4a6a3323885b0f2701b9a6fe3d2eea2152a23':
  changing the rules following java package renaming for external/apache-harmony.
 2014-03-07 19:39:27 +00:00
Narayan Kamath
61955de13c am d4dc88b0: Merge "Adding apache-harmony to cts." 
* commit 'd4dc88b0f5be3670187f2fe3bb659aaeec032d3a':
  Adding apache-harmony to cts.
 2014-03-07 19:39:26 +00:00
Narayan Kamath
ffe76b1792 am 92e99b12: Merge "add jsr166 tests to cts. Bug: 10390711" 
* commit '92e99b128d170b28972ac3910090734e803c93e5':
  add jsr166 tests to cts. Bug: 10390711
 2014-03-07 19:39:26 +00:00
Stephen Hines
baa20999de am 051e28fe: Merge "Fix incorrect x86 build rules." 
* commit '051e28fe2128a284ec7987f903f02b9f5826391b':
  Fix incorrect x86 build rules.
 2014-03-07 19:38:32 +00:00
Colin Cross
0ae55418f6 am a9baf879: Merge "fix build" 
* commit 'a9baf8795e5d770a2e0ee7da22781701842932bd':
  fix build
 2014-03-07 19:33:34 +00:00
Colin Cross
e87b349acf am 3bbaab31: Merge changes I2514f66f,I71fed98d 
* commit '3bbaab31069045aea9ae33c1d995640e56182a82':
  support LOCAL_MODULE_TARGET_ARCH for prebuilts
  Add generated sources dir to the default include path
 2014-03-07 19:33:26 +00:00
Ying Wang
542b98ebe9 am e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build." 
* commit 'e2f06adb8873ede16f829690b4dbab07b8121aa8':
  Don't check the existence for the 64-bit modules for 32-bit SDK build.
 2014-03-07 19:33:21 +00:00
Colin Cross
17821ae6f1 am 7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds" 
* commit '7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f':
  don't use LOCAL_*_arch for host builds
 2014-03-07 19:33:20 +00:00
Ben Cheng
395ae92afb am 21ef9705: am f230bcf4: Merge "OProfile is no longer compiled now." 
* commit '21ef9705b67bc8c2666a30bf71db0ba5125c93f2':
  OProfile is no longer compiled now.
 2014-03-07 16:55:52 +00:00
Ying Wang
16ae8b4dd1 am 5c7039fb: Merge "Remove dead code." 
* commit '5c7039fb069c040759df0a5a15241dd7f8b2f9b7':
  Remove dead code.
 2014-03-07 02:30:02 +00:00
Ying Wang
14040db928 am bec954d0: Merge "Clean up dangling module names" 
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
  Clean up dangling module names
 2014-03-07 02:27:32 +00:00
Ying Wang
e23ee3ec25 am b12cce10: Merge "Refine module name resolving in multilib build" 
* commit 'b12cce10fab8c9adda213506be4ce675104655da':
  Refine module name resolving in multilib build
 2014-03-07 02:27:31 +00:00
Elliott Hughes
77285ffc9b am 993ffb80: Merge "Add all-S-files-under." 
* commit '993ffb802ee90e07e73e67e523fd040395dfd74d':
  Add all-S-files-under.
 2014-03-07 02:27:16 +00:00
Colin Cross
d52c6101b7 am 90ed06ef: Merge "fix 2nd target clang prebuilt paths" 
* commit '90ed06ef84aee84dfc1edba1503a2b2036fc867d':
  fix 2nd target clang prebuilt paths
 2014-03-07 02:27:06 +00:00
Ben Cheng
9a854e7114 am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__" 
* commit '6c5d89764848b604c01d0dca7104d9e075aed2b2':
  Refreshed gcc predefines __ANDROID__
 2014-03-07 02:25:17 +00:00
Ying Wang
22e268503b am 5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch." 
* commit '5cc7f8a720fdeb2c2ec46b6ec212d05587e76163':
  Select the arch_variant_cflags for the 2nd arch.
 2014-03-07 02:25:09 +00:00
Ying Wang
f968cb1f3d am 737a51dd: Merge "Refactor llvm_config.mk and support the 2nd arch" 
* commit '737a51dd7294b0443b4f1ac55372310d635c5121':
  Refactor llvm_config.mk and support the 2nd arch
 2014-03-07 02:25:02 +00:00
Colin Cross
ef28912a41 am 5e9a2033: Merge "don\'t rename 32-bit packages to *_32" 
* commit '5e9a20337e1110868296c27f201e4579e5e3fb9e':
  don't rename 32-bit packages to *_32
 2014-03-07 02:24:36 +00:00
Elliott Hughes
aa2143f02c am 8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds." 
* commit '8b20d5b97e98ddac6031cb555078f425aef1da8f':
  Turn 64-bit-related warnings into errors on 64-bit builds.
 2014-03-07 02:24:09 +00:00
Elliott Hughes
17a1e7a412 am efb9603a: Merge "[MIPS64] Add mips64 target" 
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
  [MIPS64] Add mips64 target
 2014-03-07 02:24:02 +00:00
Christopher Ferris
1277559bf5 am afbbce3f: Merge "Add library test makefile solutions." 
* commit 'afbbce3ff1d2d94e54f48d748d18796ce671fce9':
  Add library test makefile solutions.
 2014-03-07 02:23:40 +00:00
Colin Cross
80c83d993c am 054b0274: Merge topic \'arm64\' 
* commit '054b0274fc27babb42a60002ad25c9e608eac257':
  add support for more LOCAL_*_arch variables
  don't rename 32-bit executables to *_32
  remove 2nd arch from ARCH_ARM_* defines
 2014-03-07 02:23:36 +00:00
Colin Cross
b9ad6792c0 am 717de0f5: Merge "Fix installing 2nd arch shared libraries" 
* commit '717de0f553dc3c1a2baa0cc988af1adc5b26dba8':
  Fix installing 2nd arch shared libraries
 2014-03-07 02:23:35 +00:00
Tim Murray
94f1e3055c am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base." 
* commit '5352018b0b115061bce7a2aac14780ffea3885c7':
  Add new rs directory to list of Java subdirs of fw/base.
 2014-03-07 01:34:31 +00:00
Ying Wang
a4ec5e6c67 am a77456b8: Merge "Dedup the targets and dependencies of required modules." 
* commit 'a77456b8e8a5e66705e48e1ec4eebc1889553c6a':
  Dedup the targets and dependencies of required modules.
 2014-03-07 01:34:08 +00:00
Brian Carlstrom
b04562ad0f am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit '601d39b688bcbb1789e145d1b72753206c24d374':
  build: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-03-07 00:37:15 +00:00
Ian Rogers
9022dde627 am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds." 
* commit 'e854276dd19ee0ce139cc35f98b49189b7750b2d':
  Disable WITH_HOST_DALVIK on 64bit host builds.
 2014-03-06 22:58:26 +00:00
Narayan Kamath
0a468d6ef7 am ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds." 
* commit 'ad9209adff8d2f94c57387ee3d3abcff28049091':
  Define __STDC_FORMAT_MACROS on Windows host builds.
 2014-03-06 22:58:05 +00:00
Colin Cross
536405b6a0 am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY" 
* commit 'a8e6166fa482782719dce28a9ae1869f017e7cee':
  build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
 2014-03-06 20:23:42 +00:00
Colin Cross
56390a16fc am 2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64" 
* commit '2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
  build: support LOCAL_*_32 and LOCAL_*_64
 2014-03-06 20:23:41 +00:00
Ian Rogers
249f8e0bf1 am 805cb8fa: Merge "Fix the host inttypes.h problem globally." 
* commit '805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
  Fix the host inttypes.h problem globally.
 2014-03-06 20:23:29 +00:00
Ben Cheng
d8ce7d8fd6 OProfile is no longer compiled now. 
BUG: 13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
 2014-03-05 16:59:41 -08:00
Nicolas Geoffray
50fcf75308 am db48d145: am 247dd0c4: Merge "Do not remove the generated .hpp file from yacc." 
* commit 'db48d145841afb9b9b6d1c124191a1681d6b4f39':
  Do not remove the generated .hpp file from yacc.
 2014-03-05 18:04:30 +00:00
Nicolas Geoffray
247dd0c4af Merge "Do not remove the generated .hpp file from yacc." 2014-03-05 14:09:26 +00:00
Nicolas Geoffray
3f5cc08d46 am b11697d3: am 68d38154: Merge "Remove host-prefix command line argument to dex2oat." 
* commit 'b11697d30778db51d476aedd28b0e2c65eb241e3':
  Remove host-prefix command line argument to dex2oat.
 2014-03-04 17:24:44 +00:00
Nicolas Geoffray
5fd9a32c4f Remove host-prefix command line argument to dex2oat. 
Change-Id: If4a962976d1e8a283d6b682112a1b12d328d8dbb
 2014-03-04 17:06:40 +00:00
Nicolas Geoffray
3cb9ddbdec Do not remove the generated .hpp file from yacc. 
Depending on the file extension of the generated C++ file,
bison will generate a #include of a .h or .hpp. So both files
must be kept in the generated directory.

Change-Id: Id0aac7f407bdc69c7f5012c0d021761b0fceb427
 2014-03-04 14:48:55 +00:00
Andrew Hsieh
1537f8bfde am 12493c89: am 6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer" 
* commit '12493c892e59d826eec41caea6bc90a5778bb672':
  Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
 2014-03-04 01:12:03 +00:00
Andrew Hsieh
6808c2608f Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer" 2014-03-04 01:06:04 +00:00
Colin Cross
a86544106f Remove idmap from 64-bit blacklist 
frameworks/native/cmds/idmap was accidentally added to the blacklist
in a bad merge in commit a0eb50acca.

Change-Id: I545d401a934f1183e03235d5abe5ab15563a4e6d
 2014-03-03 10:32:09 -08:00
Nicolas Geoffray
2801735ab1 am d85ef325: am 460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files." 
* commit 'd85ef325de805996050170b3ce1cc199cba7c980':
  Extend YACC and LEX handling to .yy and .ll files.
 2014-03-03 18:08:45 +00:00
Nicolas Geoffray
460ed38aa9 Merge "Extend YACC and LEX handling to .yy and .ll files." 2014-03-03 18:03:29 +00:00
Nicolas Geoffray
9484e2e13f Extend YACC and LEX handling to .yy and .ll files. 
The external mclinker project has .yy and .ll files that
require the same rules as .y and .l.

Change-Id: I2b02df9a74bac9c215f8aeb8ee2ff0d2616526ed
 2014-03-03 15:58:46 +00:00
Narayan Kamath
3246d88d6c resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp 
Change-Id: I5cb6aeb5dd250aeba059feb1c70c13ac4745db3b
 2014-03-03 12:14:41 +00:00
Andrew Hsieh
c4f7fbae02 Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer 
Analyzer needed by WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK is
moved from prebuilts/clang/{linux-x86,darwin-x86}/host/3.3 to
prebuilts/misc/{linux-x86,darwin-x86}/analyzer

See https://android-review.googlesource.com/#/c/83852/

BUG=13243591

Usage:

"WITH_SYNTAX_CHECK=1 make ..." instructs build system to invoke "clang -fsyntax-only"
to utilize clang's better diagnostics before calling LOCAL_CC/LOCAL_CXX for code generation.
The compilation time is slightly longer, and the generated object file should be the same as
w/o WITH_SYNTAX_CHECK

"WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..." instructs build system to run static
analyzer via "clang --analyze" on a successful build.  If analyzer finds any issue, instruction
to open report is displayed. See http://clang-analyzer.llvm.org/scan-build.html for details.

WITH_STATIC_ANALYZER trumps WITH_SYNTAX_CHECK if both exist.  Project use lots of GCC extensions
(eg. nested function) not supported by clang may opt out by adding LOCAL_NO_STATIC_ANALYZER:=true

Change-Id: Ib3dda3ffb0fd3aaf2eadec867a966d1dd2868fb1
 2014-03-03 18:47:02 +08:00
Narayan Kamath
9f274954c8 Amend 64 bit blacklist. 
- external/skia now builds on arm64, frameworks/base/libs/hwui
  depends on it.
- external/bluetooth/bluedroid builds on 64 bit, though there
  isn't any obvious way to test it without real hardware.
- frameworks/ml now builds, as does external/srec
- frameworks/opt, frameworks/ex and frameworks/wilhelm don't
  build because of their dependency on frameworks/av.

frameworks/av should probably be dropped out of the blacklist
and replaced by individual markers on targets that we want
for 64 bit (we don't want all of them for arm64).

Change-Id: I9735108840fcba21ac8918bedf0d6de8989de086
 2014-03-03 10:23:38 +00:00
Ying Wang
0c0e9b8153 am a6230641: am 26bcd640: Merge "Try to catch more misuse of ." 
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
  Try to catch more misuse of $(my-dir).
 2014-03-01 17:34:29 +00:00
Ying Wang
79e8319b2e Try to catch more misuse of $(my-dir). 
Change-Id: I0c07d7115c66b30ba1383dfaa133f0cc40a33ad7
 2014-02-28 18:23:06 -08:00
Griff Hazen
6c23e7b8b4 am 433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides. 
* commit '433febb3c4593e777ef393371b6e99dcce9a7217':
  Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
 2014-02-28 18:05:36 +00:00
Griff Hazen
433febb3c4 Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides. 
Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28
 2014-02-28 08:45:59 -08:00
Ying Wang
cefca29a4c am 8e286fbf: am cf1b7d4b: Merge "Select src arch for prebuilts." 
* commit '8e286fbfc712ed695008f786592fe83e4a1331a7':
  Select src arch for prebuilts.
 2014-02-28 02:33:29 +00:00
Ying Wang
6c930fc1c9 Select src arch for prebuilts. 
Change-Id: I2d08f923d28d59cfef93ff0bd9893352baaee60b
 2014-02-27 18:25:29 -08:00
JP Abgrall
352bbe5c9c DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok 
This enables tcpdump for 64bit builds.

This reverts commit 24f99bd4b3.

Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
 2014-02-27 04:05:14 +00:00
Ying Wang
b3f2893f79 am 66a9b789: Merge "Include privileged apps with app zip file." 
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
  Include privileged apps with app zip file.
 2014-02-27 01:30:08 +00:00
JP Abgrall
24f99bd4b3 DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad 
This is until aosp gets the latest libpcap+tcpdump currently only on internal.

This reverts commit 5c68e265ac.

Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
 2014-02-27 01:28:11 +00:00
Ying Wang
66a9b78970 Merge "Include privileged apps with app zip file." 2014-02-27 01:25:13 +00:00
Ying Wang
45bde7bfad am 9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist." 
* commit '9aa715a579765edf0fd4cf2fa0c0146e1b6a7c3b':
  Remove external/tcpdump from 64-bit build blacklist.
 2014-02-26 22:31:09 +00:00
Ying Wang
5c68e265ac Remove external/tcpdump from 64-bit build blacklist. 
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
 2014-02-26 14:18:21 -08:00
Ying Wang
a8d273d3ce am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules." 
* commit 'bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
  Conditionally include the 'samplecode' rules.
 2014-02-26 20:06:26 +00:00
Ying Wang
48fbc42f93 Conditionally include the 'samplecode' rules. 
Not sure goal 'samplecode' is still used by anybody these days.

Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
 2014-02-26 11:55:38 -08:00
Robert Craig
59ec195a4d Include privileged apps with app zip file. 
Include apps that appear under /system/priv-app
to also be included with the zip of all the apps.

Change-Id: If4687cf4c471877f11d78b68bad96f1842e49d87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-02-26 12:00:14 -05:00
Torne (Richard Coles)
e665992cb8 am 63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS." 
* commit '630020883abc6c8b2c13876e3195ed6abcf4890f':
  Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
 2014-02-26 11:09:29 +00:00
Torne (Richard Coles)
630020883a Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS." 2014-02-26 11:04:03 +00:00
Ying Wang
2aeff45587 am 66331624: Merge "Fix prebuilt library dependency for multilib build" 
* commit '66331624b5422a608607a9924f174ba533573032':
  Fix prebuilt library dependency for multilib build
 2014-02-26 02:38:31 +00:00
Ying Wang
58f462fccf Fix prebuilt library dependency for multilib build 
Also we don't need to include module_arch_supported.mk again, if we are
currently substituting the source build with LOCAL_PREBUILT_MODULE_FILE.

Change-Id: I444b0397d74c3153b398a050b762e49418062a86
 2014-02-25 18:32:27 -08:00
Elliott Hughes
4a122c96f3 am 9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64." 
* commit '9dba192b76ee75c578a62dcef0160fc719a57914':
  oprofile/daemon doesn't build for x86_64.
 2014-02-26 02:07:18 +00:00
Elliott Hughes
9dba192b76 Merge "oprofile/daemon doesn't build for x86_64." 2014-02-26 02:02:30 +00:00
Ying Wang
12c909b20c resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp 
Change-Id: Ie8b363ede2a062a34962f9111b79df1ebc674c9e
 2014-02-25 17:37:45 -08:00
Elliott Hughes
0cfae9fdb5 oprofile/daemon doesn't build for x86_64. 
We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.

Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356
 2014-02-25 17:32:22 -08:00
Ying Wang
a52f117073 Remove external/wpa_supplicant_8 and external/android-clat 
from 64_bit_blacklist.mk.
They now build fine for 64-bit.

Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
 2014-02-25 17:15:47 -08:00
Elliott Hughes
331272f94b am 25b55485: Merge "Take libcore off the LP64 blacklist." 
* commit '25b5548522220940f50ab5b4dfb3e2e691ad913b':
  Take libcore off the LP64 blacklist.
 2014-02-26 00:22:49 +00:00
Ying Wang
4a0b06e808 am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir" 
* commit 'f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
  Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
 2014-02-26 00:18:21 +00:00
Elliott Hughes
25b5548522 Merge "Take libcore off the LP64 blacklist." 2014-02-26 00:18:04 +00:00
Ying Wang
031e0fb308 Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir 
So a library can export the proto's include path that can be used with
both archs in multilib build.

Change-Id: Ia0f92f0b40e39dc3fa426c69c52139a0a8f04077
 2014-02-25 16:12:16 -08:00
Elliott Hughes
6749f6db16 Take libcore off the LP64 blacklist. 
Change-Id: I34bc49370ecdd37f83927c3829c775e404bcbd73
 2014-02-25 15:54:26 -08:00
Torne (Richard Coles)
db7dcc210a Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS. 
For host executables and shared libraries, the global LDFLAGS were being
inserted into the linker command line after the module-specific ones,
making it impossible to override the default settings. Change the order
to match target linker invocations.

Change-Id: Icd5f6f83df9f27a5be97ddb197ee245c1ab8c2be
 2014-02-25 13:33:30 +00:00
Ying Wang
9b996f80a9 am eb9b62e0: Merge "Make -rpath-link work with multilib." 
* commit 'eb9b62e08d25ec9067a3f47634a2b8cf750230d8':
  Make -rpath-link work with multilib.
 2014-02-22 00:45:52 +00:00
Tim Murray
64fa69d17e am 254a88b9: Merge "Switch to LLVM 3.4 prebuilts in AOSP." 
* commit '254a88b9578883f3138be6991c7bcdb8393af188':
  Switch to LLVM 3.4 prebuilts in AOSP.
 2014-02-22 00:41:28 +00:00
Ying Wang
eb9b62e08d Merge "Make -rpath-link work with multilib." 2014-02-22 00:38:43 +00:00
Ying Wang
9fb3526648 Make -rpath-link work with multilib. 
Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783
 2014-02-21 16:20:20 -08:00
Tim Murray
254a88b957 Merge "Switch to LLVM 3.4 prebuilts in AOSP." 2014-02-21 21:52:15 +00:00
Ying Wang
0c9c0bfcc6 am 9aadde67: Merge "Include in upper-level makefiles" 
* commit '9aadde673481043f650a420a104dde21a4c13f57':
  Include $(BUILD_COPY_HEADERS) in upper-level makefiles
 2014-02-20 22:32:20 +00:00
Ying Wang
bf4a8d3069 Include $(BUILD_COPY_HEADERS) in upper-level makefiles 
This makes sure copy_headers.mk only be included onces, no matter
it's for the 1st arch or the 2nd arch.

Change-Id: I80a558fbdb52861f176bd27a21c302069a5cc3ce
 2014-02-20 13:54:43 -08:00
Ying Wang
e9bb987002 am 9335001d: Merge "Strip all symbols on x86" 
* commit '9335001d5d15777522455d5f593a9a69719b12b7':
  Strip all symbols on x86
 2014-02-20 18:36:25 +00:00
Ying Wang
fab0fe3b64 am e72beb53: Merge "Remove dead code." 
* commit 'e72beb53a8f0644d65c3e218677e287c109d67c6':
  Remove dead code.
 2014-02-20 18:36:24 +00:00
Ying Wang
9335001d5d Merge "Strip all symbols on x86" 2014-02-20 18:31:07 +00:00
Ying Wang
e72beb53a8 Merge "Remove dead code." 2014-02-20 18:30:51 +00:00
Ying Wang
a5e79db079 am f9538ea6: Merge "Add missing s to mips." 
* commit 'f9538ea6261f373bdb993bc5d0a503b4ecbc0c22':
  Add missing $(combo_2nd_arch_prefix)s to mips.
 2014-02-20 07:33:47 +00:00
Elliott Hughes
369b3326f3 Add missing $(combo_2nd_arch_prefix)s to mips. 
Change-Id: I91a5f2d92cc964cbaeb1c07f27eb56ea1a0d53cc
 2014-02-19 20:29:25 -08:00
Ying Wang
3da7b96a39 Remove dead code. 
It seems the code was meant to add the toolchain to ANDROID_BUILD_PATHS
and then export to PATH by lunch.
But now we export the toolchain to PATH explicitly in envsetup.sh and
the code is unnecessary.
This reduces the places to change when we upgrade the gcc version.
It also fixed the bug that the mips toolchain was always exported
regardless of the target arch.

Change-Id: Iee3b895b4c4e0df8971c27c01b9ecbd591848b12
 2014-02-19 18:25:55 -08:00
C. Sean Young
b47c863ec7 Strip all symbols on x86 
Strip all of the non-dynamic symbols on x86 targets,
instead of just the debug symbols.

Change-Id: Id799a6a8c8b0e8bf70977328e42e5efa23762f25
 2014-02-19 12:53:43 -08:00
Ying Wang
21ec64b169 am 5aa50c66: Merge "Fix x86 config file to support 2nd ARCH build" 
* commit '5aa50c6637f88213661b29facaf05f072316dec0':
  Fix x86 config file to support 2nd ARCH build
 2014-02-19 18:26:36 +00:00
Ying Wang
32e93384b7 am 3d9c1c1a: Merge "Switch x86_64 to gcc-4.8" 
* commit '3d9c1c1a537ead6071165ea661507e0a9250dc4a':
  Switch x86_64 to gcc-4.8
 2014-02-19 18:23:10 +00:00
Ying Wang
5aa50c6637 Merge "Fix x86 config file to support 2nd ARCH build" 2014-02-19 18:19:22 +00:00
Ying Wang
3d9c1c1a53 Merge "Switch x86_64 to gcc-4.8" 2014-02-19 18:17:52 +00:00
Stephen Hines
7bc754bca9 Switch to LLVM 3.4 prebuilts in AOSP. 
Change-Id: I064e953fb1bf69e7e321616647aab88dcc39af76
 2014-02-19 09:03:00 -08:00
Colin Cross
c798836a82 am 4febec12: Merge "x86: set -msse2 for all builds" 
* commit '4febec12272a90456c5216cc10ccc059ba11552d':
  x86: set -msse2 for all builds
 2014-02-19 01:06:26 +00:00
Colin Cross
4febec1227 Merge "x86: set -msse2 for all builds" 2014-02-19 01:00:33 +00:00
Colin Cross
4aa263f2be x86: set -msse2 for all builds 
All supported x86 processors have SSE2.

Change-Id: Ib4a0511c456fe3185b0b902390860ad557aeedcf
 2014-02-18 15:49:48 -08:00
Ying Wang
f133940642 am 0c0a4ce8: Remove the default sdk.atree if custom one is set. 
* commit '0c0a4ce8f4c40b47d34774c7f36c80ae7f8082fc':
  Remove the default sdk.atree if custom one is set.
 2014-02-18 22:54:08 +00:00
Ying Wang
0c0a4ce8f4 Remove the default sdk.atree if custom one is set. 
Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d
 2014-02-18 14:33:25 -08:00
Ying Wang
52cefc36cf resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp 
Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce
 2014-02-18 11:17:53 -08:00
Pavel Chupin
c562742e0b Switch x86_64 to gcc-4.8 
x86 is already on gcc-4.8

Change-Id: I39b4298b705a6ad04cdaa434261c6b0d90d552ff
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2014-02-18 17:02:36 +04:00
Narayan Kamath
0003192c32 am 2bea94ba: Merge "Fix up android.core CTS tests." 
* commit '2bea94bac78d8a8ed5030d1e09d48db677e1167d':
  Fix up android.core CTS tests.
 2014-02-17 12:31:00 +00:00
Narayan Kamath
2a1a308f3b am 70a4a6a3: Merge "changing the rules following java package renaming for external/apache-harmony." 
* commit '70a4a6a3323885b0f2701b9a6fe3d2eea2152a23':
  changing the rules following java package renaming for external/apache-harmony.
 2014-02-17 12:30:59 +00:00
Narayan Kamath
35513f4c92 am d4dc88b0: Merge "Adding apache-harmony to cts." 
* commit 'd4dc88b0f5be3670187f2fe3bb659aaeec032d3a':
  Adding apache-harmony to cts.
 2014-02-17 12:30:58 +00:00
Narayan Kamath
6b83542627 am 92e99b12: Merge "add jsr166 tests to cts. Bug: 10390711" 
* commit '92e99b128d170b28972ac3910090734e803c93e5':
  add jsr166 tests to cts. Bug: 10390711
 2014-02-17 12:30:58 +00:00
Narayan Kamath
2bea94bac7 Merge "Fix up android.core CTS tests." 2014-02-17 12:25:26 +00:00
Narayan Kamath
70a4a6a332 Merge "changing the rules following java package renaming for external/apache-harmony." 2014-02-17 12:25:24 +00:00
Narayan Kamath
d4dc88b0f5 Merge "Adding apache-harmony to cts." 2014-02-17 12:25:21 +00:00
Narayan Kamath
92e99b128d Merge "add jsr166 tests to cts. Bug: 10390711" 2014-02-17 12:25:19 +00:00
Narayan Kamath
ba0b0e71ae Fix up android.core CTS tests. 
Fix several wrongly configured tests that were either
looking for tests in the wrong jar (apache-harmony-tests
instead of core-tests) or using the wrong prefix.

Also, this change creates subsets of the harmony tests based
on subpackage names (java.net, java.io, java.nio etc.) instead
of the earlier harmony groupings.

Change-Id: Iea0e20d23512611d1aac92b2f8219031b6396c77
 2014-02-17 12:09:24 +00:00
Tsu Chiang Chuang
7d42d0f251 changing the rules following java package renaming for 
external/apache-harmony.

(cherry picked from commit 27b4b5ffe12b179fc0d24747f9ead2d5f52c871a)

Change-Id: Ia5a7b2d401f23dfdc556ef1982efd441ed1d1ae2
 2014-02-17 12:09:13 +00:00
Tsu Chiang Chuang
9c648df491 Adding apache-harmony to cts. 
(cherry-picked from commit 5fef52e9c986184796ff1e5fe54390614ba318a6)

Change-Id: I9a6595f5e8bc30654a062e0917d3ecd3ba28ebc7
 2014-02-17 12:08:59 +00:00
Tsu Chiang Chuang
4e189b08f3 add jsr166 tests to cts. 
Bug: 10390711

Change-Id: I512770e98f61995fc33043d35562dc3b213a4930
 2014-02-17 12:08:39 +00:00
Qiming Shi
310324d28a Fix x86 config file to support 2nd ARCH build 
Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026
Signed-off-by: Qiming Shi <qiming.shi@intel.com>
 2014-02-17 17:46:48 +08:00
Stephen Hines
c4206df9e8 am 051e28fe: Merge "Fix incorrect x86 build rules." 
* commit '051e28fe2128a284ec7987f903f02b9f5826391b':
  Fix incorrect x86 build rules.
 2014-02-14 23:07:59 +00:00
Ying Wang
b1d75bd81d Make the module existence check nonfatal 
Now we have sdk variants that may inherit the non-existent module names
from the device product.

Change-Id: Ibe96a33cde650fd79ae4731561dcb674203c3b91
 2014-02-14 13:39:42 -08:00
Stephen Hines
051e28fe21 Merge "Fix incorrect x86 build rules." 2014-02-14 20:32:30 +00:00
Colin Cross
cb24189504 am a9baf879: Merge "fix build" 
* commit 'a9baf8795e5d770a2e0ee7da22781701842932bd':
  fix build
 2014-02-14 00:50:00 +00:00
Colin Cross
3a14c87520 fix build 
Include prebuilt_internal.mk for host builds.

Change-Id: I750d6f71b3a2c67b11536babb8b39060005f4ff4
 2014-02-13 16:41:52 -08:00
Colin Cross
a0eb50acca resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp 
Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
 2014-02-13 16:32:48 -08:00
Colin Cross
9b2077d4b9 am 3bbaab31: Merge changes I2514f66f,I71fed98d 
* commit '3bbaab31069045aea9ae33c1d995640e56182a82':
  support LOCAL_MODULE_TARGET_ARCH for prebuilts
  Add generated sources dir to the default include path
 2014-02-14 00:28:53 +00:00
Colin Cross
3bbaab3106 Merge changes I2514f66f,I71fed98d 
* changes:
  support LOCAL_MODULE_TARGET_ARCH for prebuilts
  Add generated sources dir to the default include path
 2014-02-14 00:24:16 +00:00
Ying Wang
1e8fec5bae am e2f06adb: Merge "Don\'t check the existence for the 64-bit modules for 32-bit SDK build." 
* commit 'e2f06adb8873ede16f829690b4dbab07b8121aa8':
  Don't check the existence for the 64-bit modules for 32-bit SDK build.
 2014-02-14 00:09:58 +00:00
Colin Cross
4048cf3a70 am 7ea5cd95: Merge "don\'t use LOCAL_*_arch for host builds" 
* commit '7ea5cd95b84c42c79f22aab7f6b8f851cc88a41f':
  don't use LOCAL_*_arch for host builds
 2014-02-14 00:09:57 +00:00
Ying Wang
940d68af53 Don't check the existence for the 64-bit modules for 32-bit SDK build. 
Change-Id: I0d5d6ecc07332bef6854466fd98380eb12fc08fc
 2014-02-13 15:56:34 -08:00
Colin Cross
e18cb93e48 support LOCAL_MODULE_TARGET_ARCH for prebuilts 
Prebuilts often support only a single architecture, allow them to
use LOCAL_MODULE_TARGET_ARCH to specify it.

Change-Id: I2514f66f682ef267bbf1a1ab78510faff0a18b64
 2014-02-13 15:36:41 -08:00
Colin Cross
2d20670380 Add generated sources dir to the default include path 
Change-Id: I71fed98dfbc0bf5efad069a251eee2e5ab2e5fe6
 2014-02-13 15:36:41 -08:00
Colin Cross
f4f2fbe220 don't use LOCAL_*_arch for host builds 
The LOCAL_*_$(TARGET_ARCH) variables don't make sense for host
modules, only append use them for target modules.

Also complete the list of LOCAL_*_arch and LOCAL_*_32/64 to be
consistent.

Change-Id: I00c83e5c4e08ed9a844f9f99a79ce4bcc3f0bf11
 2014-02-13 13:48:23 -08:00
Stephen Hines
6d5dd2367a Fix incorrect x86 build rules. 
combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their
linker command lines. This results in clang builds not working properly,
since they strip some unknown flags from TARGET_GLOBAL_CFLAGS.

Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
 2014-02-13 09:24:29 -08:00
Ying Wang
5768ac917c am 5c7039fb: Merge "Remove dead code." 
* commit '5c7039fb069c040759df0a5a15241dd7f8b2f9b7':
  Remove dead code.
 2014-02-13 01:45:38 +00:00
Ying Wang
dc6bb0477d Remove dead code. 
Change-Id: Ia36a04037e15cbf296f375f3ece9a7e977fdca1e
 2014-02-12 17:38:46 -08:00
Colin Cross
2c32144b32 resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp 
Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
 2014-02-12 13:09:29 -08:00
Ying Wang
4170e2be8e am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev 
* commit 'fd841351efaeb241f0b499231671772caa21f19e':
  Support custom sdk.atree files.
 2014-02-12 20:58:02 +00:00
Ying Wang
fd841351ef Merge "Support custom sdk.atree files." into klp-modular-dev 2014-02-12 20:54:30 +00:00
Colin Cross
02e31d240a HACK: add 64-bit directory blacklist 
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
 2014-02-12 12:17:55 -08:00
Colin Cross
8e4041271d add support for module supported or unsupported target architectures 
Add four new variables for module makefiles:

LOCAL_MODULE_TARGET_ARCH specifies that a module is only supported for
one or more architectures.  Any architecture not in the list will be
not attempt to build the module.  The expected use case is prebuilts
that are only suitable for a single architecture, or modules like llvm
that need per-architecture support.

LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH specifies that a module cannot be
built for one or more architectures.

LOCAL_MODULE_TARGET_ARCH_WARN and LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH_WARN
are the same, but warn that the arch is not supported, which is useful
for modules that are critical but not yet working.

The logic for whether or not to build an architecture is fairly
complicated, so this patch consolidates it into module_arch_supported.mk

Change-Id: I120caf4a375f484e1fd6017b60c2f53882ae01e6
 2014-02-12 12:17:55 -08:00
Ying Wang
b6d53f0b31 am bec954d0: Merge "Clean up dangling module names" 
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
  Clean up dangling module names
 2014-02-12 19:22:52 +00:00
Ying Wang
1968f286d6 am b12cce10: Merge "Refine module name resolving in multilib build" 
* commit 'b12cce10fab8c9adda213506be4ce675104655da':
  Refine module name resolving in multilib build
 2014-02-12 19:22:51 +00:00
Elliott Hughes
1e317e77fa am 993ffb80: Merge "Add all-S-files-under." 
* commit '993ffb802ee90e07e73e67e523fd040395dfd74d':
  Add all-S-files-under.
 2014-02-12 19:22:29 +00:00
Ying Wang
bec954d05e Merge "Clean up dangling module names" 2014-02-12 01:31:22 +00:00
Ying Wang
d18e570fba Clean up dangling module names 
Those modules have disappeared from the source tree.

https://code.google.com/p/android/issues/detail?id=61210

Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
 2014-02-11 17:28:30 -08:00
Ying Wang
b12cce10fa Merge "Refine module name resolving in multilib build" 2014-02-12 01:26:10 +00:00
Elliott Hughes
993ffb802e Merge "Add all-S-files-under." 2014-02-11 22:01:32 +00:00
Elliott Hughes
e3b044a0cc Add all-S-files-under. 
Change-Id: I25416e2acc850c61226bc7a8e0536384f6eb2dce
 2014-02-11 13:48:35 -08:00
Colin Cross
d121d41730 am 90ed06ef: Merge "fix 2nd target clang prebuilt paths" 
* commit '90ed06ef84aee84dfc1edba1503a2b2036fc867d':
  fix 2nd target clang prebuilt paths
 2014-02-11 21:03:55 +00:00
Colin Cross
b0ef9111ac fix 2nd target clang prebuilt paths 
Change-Id: I4c196221bd377e30bbff1aafa265952e29c85cb5
 2014-02-11 12:48:12 -08:00
Ying Wang
14a6cbd902 Refine module name resolving in multilib build 
-- Added TARGET_PREFER_32_BIT, which sets LOCAL_32_BIT_ONLY for an
   executable, if LOCAL_NO_2ND_ARCH is not true.

Name resolving in 64-bit multilib build:
-- Name resolving in PRODUCT_PACKAGES:
   foo:32 resolves to foo_32;
   foo:64 resolves to foo;
   foo resolves to both foo and foo_32 (if foo_32 is defined).

-- Name resolving for LOCAL_REQUIRED_MODULES:
   If a module is built for 2nd arch, its required module resolves to
   32-bit variant, if it exits;
   Otherwise for executable and shared library, a required module
   resolves to the default 64-bit variant; for other module classes,
   required module foo resolves to both foo and foo_32 (if foo_32 is
   defined)

Bug: 12898862
Change-Id: I5fda1a77f58814097b10b5ad2743ee25adfaecc4
 2014-02-10 22:39:14 -08:00
Ying Wang
74b7131771 am 2d72094f: am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp 
* commit '2d72094f06e3cdfc78a3cfda9163cdb45ea7dbbb':
  Allow proguarding the main app and the test app in a single run.
 2014-02-08 18:37:33 +00:00
Ying Wang
2d72094f06 am 960d919e: resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp 
* commit '960d919e814726f05ad1a9b82e6a9677f9977f15':
  Allow proguarding the main app and the test app in a single run.
 2014-02-08 18:35:13 +00:00
Ying Wang
960d919e81 resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp 
Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
 2014-02-08 10:31:46 -08:00
Ben Cheng
7495e68a61 am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__" 
* commit '6c5d89764848b604c01d0dca7104d9e075aed2b2':
  Refreshed gcc predefines __ANDROID__
 2014-02-07 21:40:49 +00:00
Ben Cheng
6c5d897648 Merge "Refreshed gcc predefines __ANDROID__" 2014-02-07 21:36:46 +00:00
Ben Cheng
859c826ffc Refreshed gcc predefines __ANDROID__ 
Change-Id: Id76f5a7490fba8190329e5ce3c4b138976a034ce
 2014-02-07 13:16:18 -08:00
Ying Wang
34afc565b4 am 5cc7f8a7: Merge "Select the arch_variant_cflags for the 2nd arch." 
* commit '5cc7f8a720fdeb2c2ec46b6ec212d05587e76163':
  Select the arch_variant_cflags for the 2nd arch.
 2014-02-07 20:37:28 +00:00
Mihail Dumitrescu
4df82b3e30 Allow proguarding the main app and the test app in a single run. 
Bug: 12895101
Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
 2014-02-07 19:11:24 +00:00
Ying Wang
de9955c35e Select the arch_variant_cflags for the 2nd arch. 
Change-Id: Id2f9d7073a4aae3ba0fe5e5464045761f4d42b4e
 2014-02-07 10:44:10 -08:00
Ying Wang
d616a73db2 am 737a51dd: Merge "Refactor llvm_config.mk and support the 2nd arch" 
* commit '737a51dd7294b0443b4f1ac55372310d635c5121':
  Refactor llvm_config.mk and support the 2nd arch
 2014-02-07 18:09:13 +00:00
Ying Wang
737a51dd72 Merge "Refactor llvm_config.mk and support the 2nd arch" 2014-02-07 18:03:34 +00:00
Ying Wang
1f9828387d Refactor llvm_config.mk and support the 2nd arch 
1. Following the setup of gcc in build/core/combo/,
we added the [HOST|TARGET]_<arch>.mk clang config files,
and load only the configs needed by the current product.
2. Added support for the 2nd arch.

Change-Id: I2a383418a9688a050b39492f8e489d40eeeb5f2d
 2014-02-07 09:11:22 -08:00
Colin Cross
ddd7c919d2 am 5e9a2033: Merge "don\'t rename 32-bit packages to *_32" 
* commit '5e9a20337e1110868296c27f201e4579e5e3fb9e':
  don't rename 32-bit packages to *_32
 2014-02-07 07:53:23 +00:00
Colin Cross
58d879f4f4 don't rename 32-bit packages to *_32 
Renaming 32-bit packages to *_32 breaks PRODUCT_PACKAGES dependencies.

Change-Id: I5457c07b64885d77a6bd8fbcbba97d28393c581d
 2014-02-06 15:31:02 -08:00
Elliott Hughes
4d5fa51097 am 8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds." 
* commit '8b20d5b97e98ddac6031cb555078f425aef1da8f':
  Turn 64-bit-related warnings into errors on 64-bit builds.
 2014-02-06 20:59:33 +00:00
Elliott Hughes
8b20d5b97e Merge "Turn 64-bit-related warnings into errors on 64-bit builds." 2014-02-06 20:54:05 +00:00
Elliott Hughes
3f0408695b am efb9603a: Merge "[MIPS64] Add mips64 target" 
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
  [MIPS64] Add mips64 target
 2014-02-06 20:21:41 +00:00
Ying Wang
69c3f4570d am dc7fee9f: Set up rules to merge AndroidManifest.xmls 
* commit 'dc7fee9fbf46ac06c840c7edfd51fbefeece63e4':
  Set up rules to merge AndroidManifest.xmls
 2014-02-06 18:07:51 +00:00
Chris Dearman
1efd9e462a [MIPS64] Add mips64 target 
Change-Id: Ice1621101c0d5a3314db288542ca8020e3f406bf
Signed-off-by: Duane Sand <duane.sand@imgtec.com>
 2014-02-05 19:07:57 -08:00
Christopher Ferris
6d0899ea47 am afbbce3f: Merge "Add library test makefile solutions." 
* commit 'afbbce3ff1d2d94e54f48d748d18796ce671fce9':
  Add library test makefile solutions.
 2014-02-06 02:59:39 +00:00
Ying Wang
dc7fee9fbf Set up rules to merge AndroidManifest.xmls 
Now you can merge the library manifest files to the main app's
AndroidManifest.xml with LOCAL_FULL_LIBS_MANIFEST_FILES.
LOCAL_FULL_LIBS_MANIFEST_FILES is a list of paths relative to the top of
the source tree.

Bug: 12907528
Change-Id: I16a347c83dfb6fbbb7d5d40284b7c65aa682fdd2
 2014-02-05 18:24:45 -08:00
Christopher Ferris
afbbce3ff1 Merge "Add library test makefile solutions." 2014-02-06 02:16:35 +00:00
Elliott Hughes
18042e1960 Turn 64-bit-related warnings into errors on 64-bit builds. 
I don't think we can realistically turn this on for 32-bit builds any
time soon.

Also, fix the arm64 stack-protector hack.

Change-Id: Ie1e7c875bbc06fb21bb372b8ca99879a23ef53d4
 2014-02-05 17:40:02 -08:00
Christopher Ferris
70ca5e5b39 Add library test makefile solutions. 
Change-Id: Ibc8df9b0e2342683158936bf011425780df8f02a
 2014-02-05 16:36:42 -08:00
Colin Cross
d69ed2e25c am 054b0274: Merge topic \'arm64\' 
* commit '054b0274fc27babb42a60002ad25c9e608eac257':
  add support for more LOCAL_*_arch variables
  don't rename 32-bit executables to *_32
  remove 2nd arch from ARCH_ARM_* defines
 2014-02-06 00:01:38 +00:00
Colin Cross
dc5249ab3c am 717de0f5: Merge "Fix installing 2nd arch shared libraries" 
* commit '717de0f553dc3c1a2baa0cc988af1adc5b26dba8':
  Fix installing 2nd arch shared libraries
 2014-02-06 00:01:37 +00:00
Colin Cross
90353fe86f add support for more LOCAL_*_arch variables 
Add support for:
LOCAL_SHARED_LIBRARIES_arch
LOCAL_STATIC_LIBRARIES_arch
LOCAL_WHOLE_STATIC_LIBRARIES_arch
LOCAL_GENERATED_SOURCES_arch
LOCAL_REQUIRED_MODULES_arch

Change-Id: Iad91702e140d8dba7dcaee13f236c77b1e626a34
 2014-02-04 19:44:57 -08:00
Colin Cross
5394bf1950 Fix installing 2nd arch shared libraries 
2ND_TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES was not set,
which was causing the later += to act like = instead of
:=, and the dependencies would disappear as soon as
LOCAL_MODULE was cleared.

Change-Id: Idea291524fc06377deafec62f37d20eaa7f93bca
 2014-02-04 19:44:09 -08:00
Colin Cross
aee1e779f4 don't rename 32-bit executables to *_32 
Renaming 32-bit executables to *_32 breaks PRODUCT_PACKAGES
dependencies.

Change-Id: I53d89991633ef4af03c4e618c463769937a70e38
 2014-02-04 19:44:09 -08:00
Colin Cross
ec14ce578b remove 2nd arch from ARCH_ARM_* defines 
Users of ARCH_ARM_* defines don't care about first vs. second arch,
set ARCH_ARM_* regardless of which arch is arm.

Change-Id: I2ae83ec5c3f839ff91a0e352c95d76ec2cbd5dc5
 2014-02-04 19:44:09 -08:00
Adam Lesinski
bebb2b54ce am 7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev 
* commit '7b734fd8d163f7a71254b909fbbcd358129924b7':
  Allow multiple asset directories in aapt
 2014-02-05 00:49:37 +00:00
Adam Lesinski
7b734fd8d1 Merge "Allow multiple asset directories in aapt" into klp-modular-dev 2014-02-05 00:47:00 +00:00
Adam Lesinski
64cf9807b9 Allow multiple asset directories in aapt 
AAPT already supports this.

Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8
 2014-02-05 00:13:58 +00:00
Justin Koh
bbfebfad0d resolved conflicts for merge of 303d2755 to klp-modular-dev-plus-aosp 
Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9
 2014-02-04 15:16:15 -08:00
Justin Koh
303d275591 Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT. 
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.

Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
 2014-02-03 16:26:43 -08:00
Tim Murray
47f9b9bc29 am 5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base." 
* commit '5352018b0b115061bce7a2aac14780ffea3885c7':
  Add new rs directory to list of Java subdirs of fw/base.
 2014-02-03 22:44:31 +00:00
Tim Murray
5352018b0b Merge "Add new rs directory to list of Java subdirs of fw/base." 2014-02-03 22:35:54 +00:00
Ying Wang
1446cf93ed am a77456b8: Merge "Dedup the targets and dependencies of required modules." 
* commit 'a77456b8e8a5e66705e48e1ec4eebc1889553c6a':
  Dedup the targets and dependencies of required modules.
 2014-02-03 00:45:03 +00:00
Ying Wang
3136010cdd Dedup the targets and dependencies of required modules. 
For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.

Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
 2014-01-31 19:22:35 -08:00
Tim Murray
f6752d303f Add new rs directory to list of Java subdirs of fw/base. 
Change-Id: I3213a314e7700162e781526c0450678495442759
 2014-01-31 12:32:42 -08:00
Brian Carlstrom
a15fc8fd1a am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit '601d39b688bcbb1789e145d1b72753206c24d374':
  build: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-01-31 12:34:17 +00:00
Ian Rogers
1fee45f1af am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds." 
* commit 'e854276dd19ee0ce139cc35f98b49189b7750b2d':
  Disable WITH_HOST_DALVIK on 64bit host builds.
 2014-01-31 12:17:16 +00:00
Narayan Kamath
b1aec05aae am ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds." 
* commit 'ad9209adff8d2f94c57387ee3d3abcff28049091':
  Define __STDC_FORMAT_MACROS on Windows host builds.
 2014-01-31 12:17:03 +00:00
Colin Cross
6a7699d5c6 am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY" 
* commit 'a8e6166fa482782719dce28a9ae1869f017e7cee':
  build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
 2014-01-31 10:27:06 +00:00
Colin Cross
df313a04a1 am 2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64" 
* commit '2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
  build: support LOCAL_*_32 and LOCAL_*_64
 2014-01-31 10:27:05 +00:00
Ian Rogers
eb02fa0a6b am 805cb8fa: Merge "Fix the host inttypes.h problem globally." 
* commit '805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
  Fix the host inttypes.h problem globally.
 2014-01-31 10:26:52 +00:00
Brian Carlstrom
49f1fab8a5 build: Rename persist.sys.dalvik.vm.lib to allow new default 
Bug: 12798969
Change-Id: Ie73a3f2b6655d0ae3e3a905a1c64747343c525a0
 2014-01-30 13:16:37 -08:00
Ian Rogers
d206afecb8 Disable WITH_HOST_DALVIK on 64bit host builds. 
Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
 2014-01-30 08:55:17 -08:00
Ian Rogers
694b2b7b12 Define __STDC_FORMAT_MACROS on Windows host builds. 
Change-Id: I89b54a63c3f111b8242fe9e813d94a839c484195
 2014-01-29 21:37:37 -08:00
Colin Cross
78d642f426 build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY 
Rename for consistency with TARGET_IS_64_BIT.

Change-Id: I824dcaed0c1e88b8246bcffb21ab3f1772175926
 2014-01-29 18:35:23 -08:00
Colin Cross
44a752659c build: support LOCAL_*_32 and LOCAL_*_64 
Support the following new variables based on whether the current multilib
target is 32 bit or 64 bit:
LOCAL_CFLAGS_32
LOCAL_CFLAGS_64
LOCAL_LDFLAGS_32
LOCAL_LDFLAGS_64
LOCAL_ASFLAGS_32
LOCAL_ASFLAGS_64
LOCAL_C_INCLUDES_32
LOCAL_C_INCLUDES_64

Change-Id: Ia868d56dff114be301bf8297eec768675f186927
 2014-01-29 18:35:23 -08:00
Colin Cross
e39bb7ea46 am 190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev 
* commit '190ebe94e1a3c18183fa1940e7599b4d6f70b470':
  pdk: add android_common.jar
 2014-01-30 00:59:55 +00:00
Colin Cross
190ebe94e1 Merge "pdk: add android_common.jar" into klp-volantis-dev 2014-01-30 00:53:56 +00:00
Ian Rogers
61e5059ef7 Fix the host inttypes.h problem globally. 
Bug: 12708004
Change-Id: I2c75647bac304b82e150c540b9e6c5568997596d
 2014-01-29 16:29:11 -08:00
Ying Wang
780128a6f0 Support custom sdk.atree files. 
Bug: 12683047
Change-Id: I79ca1eff81e947d03c50759d47426487e48435d0
 2014-01-29 13:35:55 -08:00
Colin Cross
4b764993a9 pdk: add android_common.jar 
Add android_common.jar to the pdk java libraries to allow partners
to build test apps against it.

Change-Id: I3f3c0f6ef086489aec293e10b0d707845b174655
 2014-01-29 10:01:37 -08:00
Elliott Hughes
07ada634a1 am 833188c1: am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread." 
* commit '833188c16ea5d2f12aa0108119c327d6cd31d4ea':
  gtest needs -lpthread.
 2014-01-29 01:55:36 +00:00
Elliott Hughes
833188c16e am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread." 
* commit 'e7bd4f5cdf5d1ac0c49d42ed41322f10e7f34f9b':
  gtest needs -lpthread.
 2014-01-29 01:53:14 +00:00
Elliott Hughes
e7bd4f5cdf am 472a4858: Merge "gtest needs -lpthread." 
* commit '472a48585ec1cfb66c5716f85b0efdf528b29f5d':
  gtest needs -lpthread.
 2014-01-29 01:50:34 +00:00
Elliott Hughes
472a48585e Merge "gtest needs -lpthread." 2014-01-29 01:45:17 +00:00
Elliott Hughes
52e52d1447 gtest needs -lpthread. 
Host gtests that don't use pthreads themselves need to be linked
against libpthread because gtest itself uses pthreads to ensure
thread-safety. (It can't know in advance whether the code under
test is going to spin up threads, so it has to be pessimistic.)

Change-Id: I14fb1098c163d7fe6ae9a9a0314acead4ec9383d
 2014-01-28 17:32:30 -08:00
Elliott Hughes
bc528c22b8 am f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86." 
* commit 'f7784e46170e90cb38ddbab15b7aa3a4a7e2d07d':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
 2014-01-28 21:37:15 +00:00
Elliott Hughes
f7784e4617 am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86." 
* commit '1a0e850141fe19e1f1d503822893b8d66c0bca69':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
 2014-01-28 21:35:25 +00:00
Elliott Hughes
1a0e850141 am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86." 
* commit '1a731adf943bc716cc7b9c95b321db02ad7216db':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
 2014-01-28 21:29:52 +00:00
Elliott Hughes
1a731adf94 Merge "Fix KERNEL_HEADERS_ARCH for mips and x86." 2014-01-28 21:23:07 +00:00
Elliott Hughes
171e940c7a Fix KERNEL_HEADERS_ARCH for mips and x86. 
arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64
use headers that work for both widths. So where arm/arm64 need to handle the
second architecture case specially, all we need to do for the others is
hard-code the name. (x86_64.mk already hard-codes x86; we need to change
x86.mk for the case where we're building the 32-bit binaries for a mixed
system. mips64.mk doesn't exist yet, but when it does, it'll hard-code
just plain "mips" too.)

Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
 2014-01-28 13:10:19 -08:00
Brian Carlstrom
1737b1ab5f am dc5dd9b4: am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA" 
* commit 'dc5dd9b47fe2a24410b3e70d320655f1b5455966':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
 2014-01-28 20:54:10 +00:00
Brian Carlstrom
dc5dd9b47f am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA" 
* commit 'd3737d07c8adb0848dcddb7df03d1e6b4378ab93':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
 2014-01-28 20:52:17 +00:00
Brian Carlstrom
d3737d07c8 am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA" 
* commit '49eb440980db6680ec08c48b416e37e937bf9003':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
 2014-01-28 20:50:19 +00:00
Brian Carlstrom
8fb5dfc5c7 build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA 
(cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175)

Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
 2014-01-28 11:29:58 -08:00
Colin Cross
23710e27bc am cb1ad445: am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS" 
* commit 'cb1ad445663d190e204330b596b52e4734d9dcf0':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
 2014-01-28 02:37:21 +00:00
Colin Cross
cb1ad44566 am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS" 
* commit '0d24616dd1b29e016aaae86761574fd88d701b6d':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
 2014-01-28 02:34:05 +00:00
Colin Cross
0d24616dd1 am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS" 
* commit 'cdd1475834156b2e45b73ae86a949efa6c1215eb':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
 2014-01-28 02:31:18 +00:00
Colin Cross
8f47fc379e Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS 
To ease the transition between toolchains, allow a target to specify
a list of cflags that the toolchain does not support.  These will be
filtered out of the cflags provided by the module.

Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the
aarch64 toolchain, it does not yet suport -fstack-protector.

Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a
 2014-01-27 18:21:12 -08:00
Elliott Hughes
6fe9a94989 am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path." 
* commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
  Remove libthread_db from the default include path.
 2014-01-28 00:59:15 +00:00
Elliott Hughes
69c36ee7a8 am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path." 
* commit '4fbf23ef8267849ce88217a256b394de3904a4f6':
  Remove libthread_db from the default include path.
 2014-01-28 00:54:33 +00:00
Elliott Hughes
4fbf23ef82 am 0a3cf1a0: Merge "Remove libthread_db from the default include path." 
* commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
  Remove libthread_db from the default include path.
 2014-01-28 00:43:29 +00:00
Colin Cross
8c89a9ff9c am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6 
* commit '4695598df1fa11064a54421f60fee66032c673ee':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
 2014-01-27 23:46:39 +00:00
Elliott Hughes
2f8dcdd961 Remove libthread_db from the default include path. 
This should never have been on the default include path.

The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.

Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
 2014-01-27 15:45:17 -08:00
Colin Cross
4695598df1 am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6 
* commit 'ae49acbde766e2e683d3dd026e69f2416da766b1':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
 2014-01-27 23:43:33 +00:00
Ying Wang
3e3a56adf2 am ae1c7d96: am 50c548c8: am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS." 
* commit 'ae1c7d960715ec90afa4accf0754f176d088a30f':
  Don't modify LOCAL_MODULE_TAGS.
 2014-01-27 23:42:11 +00:00
Colin Cross
ae49acbde7 am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6 
* commit '1acb1b64b9be43503fa2a9949858b8bb36417e32':
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
 2014-01-27 15:40:22 -08:00
Colin Cross
1acb1b64b9 Merge changes I62504bad,I16208cca,I4e4ceec6 
* changes:
  add new gen/ directory for generated sources
  warn on LOCAL_MODULE_PATH in multiarch shared libraries
  Support LOCAL_MODULE_RELATIVE_PATH
 2014-01-27 23:35:01 +00:00
Ying Wang
ae1c7d9607 am 50c548c8: am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS." 
* commit '50c548c8f4e0df0c3a04e2b1cc91d79e067d940e':
  Don't modify LOCAL_MODULE_TAGS.
 2014-01-27 23:32:44 +00:00
Ying Wang
50c548c8f4 am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS." 
* commit '25a16fe80ee7795c4763045061779f3c7068813d':
  Don't modify LOCAL_MODULE_TAGS.
 2014-01-27 15:25:35 -08:00
Ying Wang
25a16fe80e Merge "Don't modify LOCAL_MODULE_TAGS." 2014-01-27 23:20:06 +00:00
Ying Wang
37bd1f2d83 Don't modify LOCAL_MODULE_TAGS. 
Change-Id: Id70d48c1d7abf02139925bcb3208515ea1a082b9
 2014-01-27 15:19:09 -08:00
Ying Wang
9f9204ec3a am a4d70f94: am 0105f1cc: am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE" 
* commit 'a4d70f9435764339695e9264ac5d815a894e1e9f':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
 2014-01-27 23:05:22 +00:00
Ying Wang
a4d70f9435 am 0105f1cc: am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE" 
* commit '0105f1cc9aa2ea3c683c197b18747f5b04310c27':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
 2014-01-27 23:01:02 +00:00
Ying Wang
0105f1cc9a am 07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE" 
* commit '07b16c0d5be77e53325a9f93c2f7f68632417792':
  collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
 2014-01-27 14:57:57 -08:00
Colin Cross
d826264621 add new gen/ directory for generated sources 
Allow modules to generate source into $OUT/gen, which will then
be copied into $OUT/obj and $OUT/obj_$(TARGET_2ND_ARCH) as
necessary.  This allows a single build rule invocation that includes
generated source to build for the first and second architectures.

Modules will need to change calls to local-intermediates-dir into
local-generated-sources-dir.

Change-Id: I62504bad9454b3d9fde7b84ab9f0a487a2ecf0bf
 2014-01-27 14:45:44 -08:00
Colin Cross
d0378b3f2d warn on LOCAL_MODULE_PATH in multiarch shared libraries 
Using LOCAL_MODULE_PATH in a shared library module while building a
multiarch target will cause build rules for both architectures to install
into the same path.  Warn and suggest LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I16208ccada6d43a26a342af35096f49d8df26e81
 2014-01-27 14:43:24 -08:00
Colin Cross
639c336dc1 Support LOCAL_MODULE_RELATIVE_PATH 
Most users of LOCAL_MODULE_PATH are setting a subdirectory of the
normal install path, for example to install HALs into system/lib/hw.
This is problematic for multiarch builds, where the install location
depends on the arch.  Allow modules to specify LOCAL_MODULE_RELATIVE_PATH.
HALs will generally use:
LOCAL_MODULE_RELATIVE_PATH := hw

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
 2014-01-27 14:43:14 -08:00
Andrew Boie
f3ec9ed045 collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE 
We have no rigorous way to detect whether the code referenced for this
mechanism changes in between builds. So declare this as a phony target
so that it is rebuilt every time.

Change-Id: Ie1670d96895719d406e7b0defd53ba3cd224dd83
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2014-01-27 12:25:43 -08:00
Ying Wang
f23971ede6 am 3512ed49: am f2777de6: am 18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES." 
* commit '3512ed49a0cecd103de62eb9869e60dab144a6fb':
  Support arch-specific LOCAL_C_INCLUDES.
 2014-01-27 19:49:25 +00:00