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

4025 commits

Author SHA1 Message Date
Andrew Hsieh
92d50c1a10 Pick gnu-libstdc++ based on TARGET_GCC_VERSION 
Previously we have only one set of include/lib paths for
LOCAL_NDK_STL_VARIANT:=gnustl_static regardless of GCC
version, which is wrong because each GCC version
come with its own libstdc++.

Change-Id: I2a01c2120b6948aedce00e2f8d08dfc6932126dd
 2014-03-25 09:46:27 +08:00
Colin Cross
966c9194a6 remove libeffects from 64-bit blacklist 
Everything under frameworks/av/media/libeffects compiles fine for
64-bit

Change-Id: I03519a98903b7d65936053ef7eda8926cce60ea0
 2014-03-24 18:40:11 -07:00
Ying Wang
266cf4f259 am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS 
* commit 'f39752e99b4e5083f1e91c46722f87def8143b49':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS
 2014-03-24 21:21:26 +00:00
Shu Zhang
453afb242c Specify -mcpu=cortex-a15 for denver CPU variants. 
Change-Id: Ic27484c92a48b45148021a61420ffdd55a9dd945
 2014-03-24 16:19:50 +08:00
Ying Wang
82a2ae714c am 5a4c783c: am 8c60a1df: Merge "Complete installed shared library dependency" 
* commit '5a4c783c2d960a4ab76b4cdd57933e31dbfe6211':
  Complete installed shared library dependency
 2014-03-22 00:03:34 +00:00
Ying Wang
d8d3721240 Complete installed shared library dependency 
Previously the installed shared library dependency doesn't include
modules introduced by LOCAL_SHARED_LIBRARIES_<arch>.
This change fix the problem.
It also cleans up use of the shared library variable.

Bug: 13528787
Change-Id: Id8d807cc57f0ec4a71f18b64545d91191efad8fb
 2014-03-21 16:17:04 -07:00
Ying Wang
f39752e99b Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS 
Bug: 11335547
Change-Id: Ic08b7557a288508e8e8d14a725923960c47f5ca0
 2014-03-20 17:28:57 -07:00
Colin Cross
7e998752d7 am 189a874f: am 8c1bbdb9: Merge "remove more projects from 64-bit blacklist" 
* commit '189a874f0f3d297107d02222dc3291943a9e82b0':
  remove more projects from 64-bit blacklist
 2014-03-20 20:23:05 +00:00
Ying Wang
996f3826f7 am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT" 
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
  Remove the redundant DISABLE_DEXPREOPT
 2014-03-20 20:18:38 +00:00
Colin Cross
8c1bbdb96e Merge "remove more projects from 64-bit blacklist" 2014-03-20 20:16:53 +00:00
Ying Wang
c6848b398d Remove the redundant DISABLE_DEXPREOPT 
To disable dexpreopt, use just:
WITH_DEXPREOPT=false

Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
 2014-03-20 13:01:31 -07:00
Ying Wang
46d69e9914 am 9ce34617: am 4f9d6f57: Merge "Fix embedded build" 
* commit '9ce34617a001338093b0de85443925a37a967f0d':
  Fix embedded build
 2014-03-20 19:36:32 +00:00
Ying Wang
8c7e74ee05 Fix embedded build 
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.

Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
 2014-03-20 12:13:10 -07:00
Colin Cross
e6d118574b remove more projects from 64-bit blacklist 
These all build now.

Change-Id: If7c5f58512a2931617900ddc730797750ab8301c
 2014-03-20 00:08:20 -07:00
Mathieu Chartier
3408ca0e0d Change LIBART_IMG_TARGET_BASE_ADDRESS to 0x70000000 
Required for getting ART with valgrind on device working since
valgrind maps things in the 0x60000000 address range.

Bug: 13323732

Change-Id: I05efdbf3fe5acd1418e1d4ced5844154fb4c5d37
 2014-03-19 16:52:43 -07:00
Glenn Kasten
a7c9d15e82 am b614ef1e: am cb902fff: Merge "A few other removals for the 64 bit blacklist." 
* commit 'b614ef1eef10815652451c332954a6a6ee6f02ba':
  A few other removals for the 64 bit blacklist.
 2014-03-19 21:44:07 +00:00
Glenn Kasten
cb902fff82 Merge "A few other removals for the 64 bit blacklist." 2014-03-19 21:32:22 +00:00
Christopher Ferris
a908fc96db am aea9f041: am 8b1bcc7d: Merge "Add a method to leave the symbol table in a library." 
* commit 'aea9f041f72a128065691ac402ccdb72a5a7aad4':
  Add a method to leave the symbol table in a library.
 2014-03-19 18:15:39 +00:00
Narayan Kamath
c7d24d029b A few other removals for the 64 bit blacklist. 
- external/chromium now compiles
- stagefright codecs now compile.
- frameworks/base now compiles.

Change-Id: I1226b79cd3e0b5e2fd786bb506e022b47fe5e264
 2014-03-19 13:15:31 +00:00
Tim Kilbourn
2389da5787 am 8acc8da4: Add v17/leanback to pathmap. 
* commit '8acc8da42d1971792090f3b80b1900427e5d37fc':
  Add v17/leanback to pathmap.
 2014-03-19 09:23:43 +00:00
Christopher Ferris
a6e2f9322c Add a method to leave the symbol table in a library. 
When LOCAL_STRIP_MODULE := keep_symbols is set, then the normal strip rules
will be modified so that only the .debug_* sections are removed. The original
symbol table is left alone.

This allows the compilation of certain libraries so that libbacktrace library
can provide meaningful names to functions.

Bug: 12958251
Change-Id: I82bdc304a463012e29086325ccb51163464cb4a9
 2014-03-18 17:34:41 -07:00
Ying Wang
e36870862e am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning" 
* commit '87a25ea72f41b77898e62ad09e48e0b0de1dc84f':
  Remove arm64 clang build warning
 2014-03-18 23:07:49 +00:00
Ying Wang
ed56902c29 Remove arm64 clang build warning 
Now we have enabled arm64 clang.
This change remvoed arm64 clang build warning and cleaned the
arm64 unknow c flags.

Change-Id: Ia583a78c6d364e603ff09df423aa34a6e03d0b9b
 2014-03-18 15:58:13 -07:00
Tim Kilbourn
8acc8da42d Add v17/leanback to pathmap. 
Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec
 2014-03-18 15:20:15 -07:00
Glenn Kasten
0c2acdc042 am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit" 
* commit '023c286563ce09b2d42c81a38d4dc17ee011ac9e':
  Don't blacklist all of frameworks/av for 64-bit
 2014-03-18 21:53:41 +00:00
Glenn Kasten
97542cc9bf Merge "Don't blacklist all of frameworks/av for 64-bit" 2014-03-18 21:45:12 +00:00
Glenn Kasten
488fe8481a Don't blacklist all of frameworks/av for 64-bit 
Change-Id: Ic2db99b1b577e3355c50982af5068bce32edf4ba
 2014-03-18 12:12:54 -07:00
Ying Wang
5968350855 am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES." 
* commit '5462f7f953915bd345a58b17977e79e6405b56d0':
  Remove unused LOCAL_ASSET_FILES.
 2014-03-18 18:44:32 +00:00
Ying Wang
594f2a4261 Remove unused LOCAL_ASSET_FILES. 
Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a
 2014-03-18 11:31:09 -07:00
Andrew Hsieh
66a4ef8f75 am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared" 
* commit 'd14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
 2014-03-18 00:09:13 +00:00
Andrew Hsieh
73d800e519 Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared 
Add llvm libc++ static and shared libraries

Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
 2014-03-17 20:30:45 +08:00
Ying Wang
ce4187832a am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE" 
* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
  Don't modify LOCAL_STRIP_MODULE
 2014-03-16 20:08:31 +00:00
Ying Wang
1cda15d323 Merge "Don't modify LOCAL_STRIP_MODULE" 2014-03-16 20:02:56 +00:00
Ying Wang
e1889af2d5 Don't modify LOCAL_STRIP_MODULE 
LOCAL_STRIP_MODULE will be reused in multilib build.

Change-Id: I3512efb360c7eaafad02859723ab4368778effed
 2014-03-16 12:43:49 -07:00
Colin Cross
8213b719c8 am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang." 
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
  Work in progress to enable build system support for Clang.
 2014-03-15 23:59:32 +00:00
Colin Cross
db24577bbd Merge "Work in progress to enable build system support for Clang." 2014-03-15 23:54:03 +00:00
Tim Murray
b5f333bbef Work in progress to enable build system support for Clang. 
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
 2014-03-14 00:39:03 -07:00
Andrew Hsieh
228f8afc4d am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX" 
* commit 'de8edc8a35e5a53c6f1f8e5db099c28691319585':
  Fix HOST_TOOLCHAIN_PREFIX
 2014-03-14 00:26:55 +00:00
Andrew Hsieh
933e8940d0 Merge "Fix HOST_TOOLCHAIN_PREFIX" 2014-03-14 00:19:19 +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
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
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
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
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
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