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

6284 commits

Author SHA1 Message Date
Yabin Cui
faddef7018 am 044568be: Merge "kill HAVE_GETHOSTBYNAME_R" 
* commit '044568be18bb67a254398d65c15fe5e9caeb9d02':
  kill HAVE_GETHOSTBYNAME_R
 2014-11-13 19:21:48 +00:00
Yabin Cui
19230103ee kill HAVE_GETHOSTBYNAME_R 
Bug: 18363225
Change-Id: Ib34c094cd21b2221178755acdd9475a5bc2bf2c0
 2014-11-13 10:25:56 -08:00
Sami Tolvanen
d5f799d181 Merge "Change verity key formats" 2014-11-13 17:12:27 +00:00
Elliott Hughes
cc12050f34 am 6c706222: Merge "Remove HAVE_SHORT_ENUMS." 
* commit '6c7062221b7582c5d41acdb7a1d865ca629707ed':
  Remove HAVE_SHORT_ENUMS.
 2014-11-13 05:27:44 +00:00
Elliott Hughes
0e3a0fcb95 Remove HAVE_SHORT_ENUMS. 
Change-Id: Ia0e8a52cd8d7655508754ec0a6482f2dd055a68e
 2014-11-12 21:07:07 -08:00
Yabin Cui
f552333888 am eb793be2: am 957037dc: Merge "kill HAVE_POSIX_FILEMAP" 
* commit 'eb793be2c7d93265f2d3490835f49be361eb4513':
  kill HAVE_POSIX_FILEMAP
 2014-11-13 02:16:43 +00:00
Yabin Cui
e9680c2212 kill HAVE_FORKEXEC 
Bug: 18317407
Change-Id: Idaff8a161305325dbb0a9e00764afe98b66e3312
 2014-11-12 17:15:30 -08:00
Yabin Cui
eb793be2c7 am 957037dc: Merge "kill HAVE_POSIX_FILEMAP" 
* commit '957037dc40c7be54e7ffa6f56cca48e9db31dc7b':
  kill HAVE_POSIX_FILEMAP
 2014-11-13 00:15:25 +00:00
Yabin Cui
957037dc40 Merge "kill HAVE_POSIX_FILEMAP" 2014-11-13 00:02:25 +00:00
Chih-Hung Hsieh
abb7939af6 am 7d8b4df9: am aea83e0d: Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8" 
* commit '7d8b4df9c4502330f79cb6ad4c6f6bf33010be83':
  Upgrade host tool to x86_64-linux-glibc2.15-4.8
 2014-11-12 23:26:39 +00:00
Chih-Hung Hsieh
7d8b4df9c4 am aea83e0d: Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8" 
* commit 'aea83e0dca9a70e53677c22c72034155311287ab':
  Upgrade host tool to x86_64-linux-glibc2.15-4.8
 2014-11-12 23:23:20 +00:00
Chih-Hung Hsieh
aea83e0dca Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8" 2014-11-12 23:13:36 +00:00
Dan Albert
8914f71cc0 Remove logic for platform stlport gtest. 
Now that the platforms stlport linked gtest is gone, we don't need the
logic for this any more. All platform tests will use libc++ (which has
been renamed to libgtest without a suffix).

Note that tests built with the NDK will still use stlport, but they
will use the NDK's stlport, not the platform's.

Bug: 15193147
Change-Id: Ifcb2489ed60c41e4ed028096b516c1ee643de907
 2014-11-11 17:45:45 -08:00
Dan Albert
6da20991fd am 5245bc8b: am 201f6b3e: Merge "Make modules depend on their makefile." 
* commit '5245bc8b3421b3a9676a9ad650d0804d8d9e2787':
  Make modules depend on their makefile.
 2014-11-11 23:00:40 +00:00
Dan Albert
5245bc8b34 am 201f6b3e: Merge "Make modules depend on their makefile." 
* commit '201f6b3e92a2ef2f3a117f33cd399d5304dd385a':
  Make modules depend on their makefile.
 2014-11-11 22:56:01 +00:00
Dan Albert
954b5bdcf4 Make modules depend on their makefile. 
This should obviate much of the need for cleanspecs, and also make it
unnecessary to continue adding LOCAL_ADDITIONAL_DEPENDENCIES for this
sort of thing all over the tree.

Change-Id: I97aa8fd280ae868a5f6364f8b7bf3c2fe235d6ce
 2014-11-11 14:30:54 -08:00
Dan Albert
655f7c9a82 am a9abc487: am 1f637158: Merge "Use platform protobuf unless building with NDK." 
* commit 'a9abc487a8fdf3a82932df3f70efd9aab7fb9d35':
  Use platform protobuf unless building with NDK.
 2014-11-11 20:05:56 +00:00
Dan Albert
a9abc487a8 am 1f637158: Merge "Use platform protobuf unless building with NDK." 
* commit '1f6371583ef6ce3a384262ebb291515f5ca3a7b6':
  Use platform protobuf unless building with NDK.
 2014-11-11 19:58:42 +00:00
Dan Albert
1f6371583e Merge "Use platform protobuf unless building with NDK." 2014-11-11 19:28:34 +00:00
Dan Albert
c3031c70f7 Use platform protobuf unless building with NDK. 
The NDK protobuf library depends on the final target linking stlport
(since it is a static library). Since the platform stlport is going
away, we need to use a separate version of the protobuf library that
is compiled for the platform against libc++.

Note that this should be the case for _all_ libraries built with the
NDK. If a library needs to be used by both an NDK built final target
and a platform built final target, there should be both an NDK and
platform version of the library.

Bug: 15193147
Change-Id: I0ead61c2d1cd9d0248b304ab7d8682dedd6e8366
 2014-11-11 11:05:27 -08:00
Yabin Cui
3b9d876f93 kill HAVE_POSIX_FILEMAP 
Bug: 18315579
Change-Id: I7a20ad40dc0ec121f0e84202831e6019005104e7
 2014-11-11 10:34:37 -08:00
Elliott Hughes
d59a919e01 am 20228b6e: am b3893943: Merge "Remove unused variables from select.mk." 
* commit '20228b6e4a499105816d7386c9da2820d6200ccf':
  Remove unused variables from select.mk.
 2014-11-11 18:11:58 +00:00
Elliott Hughes
20228b6e4a am b3893943: Merge "Remove unused variables from select.mk." 
* commit 'b38939436199c65299809f6adb50db6d3b44f7b0':
  Remove unused variables from select.mk.
 2014-11-11 18:07:44 +00:00
Elliott Hughes
b389394361 Merge "Remove unused variables from select.mk." 2014-11-11 17:59:17 +00:00
Yabin Cui
b082f088e2 am 899b1877: am 4dc8e856: Merge "remove __linux__ in AndroidConfig.h" 
* commit '899b18775b24379e8b4555f4327f6b5c07306608':
  remove __linux__ in AndroidConfig.h
 2014-11-11 17:45:15 +00:00
Yabin Cui
899b18775b am 4dc8e856: Merge "remove __linux__ in AndroidConfig.h" 
* commit '4dc8e8561fa807fb6417f1405f4364a1bf6d4060':
  remove __linux__ in AndroidConfig.h
 2014-11-11 17:40:51 +00:00
Elliott Hughes
a3850a976c Remove unused variables from select.mk. 
I've no idea what these were meant to be for, but they're unused.

Change-Id: I978568bd83f91eb952c35a3a481bd517312062f0
 2014-11-10 20:47:49 -08:00
Yabin Cui
70af4d3796 remove __linux__ in AndroidConfig.h 
Bug: 18316409
Change-Id: If6644074ec86efc2f9f91a98bf82fe26be6f66d3
 2014-11-10 19:14:56 -08:00
Greg Hartman
66aadaac60 am 089d7572: am 9f00b5a0: Restore the diskinstaller dependency, since it\'s needed for GCE. automerge: 2ebfef4 
* commit '089d75728ad9498833aef07e19112d2e7321f523':
  Restore the diskinstaller dependency, since it's needed for GCE.
 2014-11-11 03:01:50 +00:00
Greg Hartman
2dd7db8883 am 5c5b443f: am 711fe355: Add a hook for the syslinux bootloader. automerge: 4c46710 
* commit '5c5b443f91da85b84bec36a78dff223ec8b2b3fe':
  Add a hook for the syslinux bootloader.
 2014-11-11 03:01:49 +00:00
Greg Hartman
089d75728a am 9f00b5a0: Restore the diskinstaller dependency, since it\'s needed for GCE. automerge: 2ebfef4 
* commit '9f00b5a077afa9f1cc77ac9bd4e8edc9d9464ae2':
  Restore the diskinstaller dependency, since it's needed for GCE.
 2014-11-11 02:55:16 +00:00
Greg Hartman
5c5b443f91 am 711fe355: Add a hook for the syslinux bootloader. automerge: 4c46710 
* commit '711fe35574d5c2f7a668db1ca69a0ce13362fd31':
  Add a hook for the syslinux bootloader.
 2014-11-11 02:55:15 +00:00
Greg Hartman
9f00b5a077 Restore the diskinstaller dependency, since it\'s needed for GCE. 
automerge: 2ebfef4

* commit '2ebfef448465b99260b6900bc207d42ead09e96c':
  Restore the diskinstaller dependency, since it's needed for GCE.
 2014-11-11 02:47:55 +00:00
Greg Hartman
711fe35574 Add a hook for the syslinux bootloader. 
automerge: 4c46710

* commit '4c46710e7a5cbcb1807d183aaeb88d68f98b6753':
  Add a hook for the syslinux bootloader.
 2014-11-11 02:47:50 +00:00
Greg Hartman
2ebfef4484 Restore the diskinstaller dependency, since it's needed for GCE. 
Change-Id: Ieb2695afbe551e829357bad56d5fe1501165b495
 2014-11-11 02:27:46 +00:00
Greg Hartman
4c46710e7a Add a hook for the syslinux bootloader. 
Change-Id: Ia8638e9dcb025743a66c52ad43b161ee70602c89
 2014-11-11 02:26:50 +00:00
Yabin Cui
c509b393eb am 1f4d40be: am 86596342: Merge "kill OS_CASE_SENSITIVE" 
* commit '1f4d40be5d9ccaed6e60b2f511b22f8f31a75ef1':
  kill OS_CASE_SENSITIVE
 2014-11-11 02:26:03 +00:00
Yabin Cui
1f4d40be5d am 86596342: Merge "kill OS_CASE_SENSITIVE" 
* commit '8659634285d29edbbb364277f5950f41e26a15d4':
  kill OS_CASE_SENSITIVE
 2014-11-11 02:15:34 +00:00
Yabin Cui
8659634285 Merge "kill OS_CASE_SENSITIVE" 2014-11-11 01:08:46 +00:00
Yabin Cui
6c812d024b am 2c1eb2fe: am d8e38e1b: Merge "kill HAVE_INOTIFY" 
* commit '2c1eb2fe213ec9a9c66fd75b6224a4396c919e59':
  kill HAVE_INOTIFY
 2014-11-11 00:24:41 +00:00
Yabin Cui
da4eeab26b am c0ce08cc: am 3dbac214: Merge "kill HAVE_STAT_ST_MTIM" 
* commit 'c0ce08cc79d502c9cfd7fc2ca37a017b63552c68':
  kill HAVE_STAT_ST_MTIM
 2014-11-11 00:21:04 +00:00
Yabin Cui
2c1eb2fe21 am d8e38e1b: Merge "kill HAVE_INOTIFY" 
* commit 'd8e38e1b1ad62a2c2f981ce0bafd40f0cee5dcef':
  kill HAVE_INOTIFY
 2014-11-11 00:19:22 +00:00
Elliott Hughes
d9dfdd0ce1 am 499ed6c4: am 83da486c: Merge "Remove HAVE_DIRENT_D_TYPE." 
* commit '499ed6c496022acf5687c01bf2faf8420c6d3760':
  Remove HAVE_DIRENT_D_TYPE.
 2014-11-11 00:16:20 +00:00
Yabin Cui
c0ce08cc79 am 3dbac214: Merge "kill HAVE_STAT_ST_MTIM" 
* commit '3dbac214c22a44042f3e12da37f0fada341123da':
  kill HAVE_STAT_ST_MTIM
 2014-11-11 00:14:25 +00:00
Yabin Cui
d8e38e1b1a Merge "kill HAVE_INOTIFY" 2014-11-11 00:11:04 +00:00
Elliott Hughes
499ed6c496 am 83da486c: Merge "Remove HAVE_DIRENT_D_TYPE." 
* commit '83da486c37fd90e9b02cbc768fedfb2ca89b96f6':
  Remove HAVE_DIRENT_D_TYPE.
 2014-11-11 00:07:17 +00:00
Yabin Cui
3dbac214c2 Merge "kill HAVE_STAT_ST_MTIM" 2014-11-11 00:04:35 +00:00
Yabin Cui
e8e5e99b76 kill HAVE_INOTIFY 
Bug: 18314841
Change-Id: Idfcbeb62a57f72a47eb732f085fbd1ab27302f85
 2014-11-10 15:44:27 -08:00
Elliott Hughes
07793e1880 Remove HAVE_DIRENT_D_TYPE. 
Only Windows doesn't have it, and we don't build atree for Windows.

Change-Id: Ib6e96be73340c36cdfcb3654ed540f690bf7550b
 2014-11-10 15:33:39 -08:00
Yabin Cui
4120e835fb kill HAVE_STAT_ST_MTIM 
Bug: 18300671
Change-Id: I92b5691924b995d9c883fc0f777c566ac4c35d1d
 2014-11-10 15:27:49 -08:00
Yabin Cui
772034bc95 kill OS_CASE_SENSITIVE 
Bug: 18314594
Change-Id: I5dc5072d43299c0e5d96ce9640e8405cbb633506
 2014-11-10 15:03:11 -08:00
Yabin Cui
c5ea225339 am ca28c637: am 1036850f: Merge "kill HAVE_SCHED_SETSCHEDULER" 
* commit 'ca28c6379c54e1abaebf4173d4d90b6501c09ae1':
  kill HAVE_SCHED_SETSCHEDULER
 2014-11-10 22:35:07 +00:00
Yabin Cui
ca28c6379c am 1036850f: Merge "kill HAVE_SCHED_SETSCHEDULER" 
* commit '1036850f8f8607f4d2898fcc73abb1fff23570d6':
  kill HAVE_SCHED_SETSCHEDULER
 2014-11-10 22:30:42 +00:00
Dan Albert
4c1a62eb45 am 8338cb68: am fb5f4177: Merge "Remove logic for libstdc++ gtest libs." 
* commit '8338cb6820951bf3994220ddd54707ccbd5dcec5':
  Remove logic for libstdc++ gtest libs.
 2014-11-10 22:23:18 +00:00
Yabin Cui
1036850f8f Merge "kill HAVE_SCHED_SETSCHEDULER" 2014-11-10 22:22:44 +00:00
Dan Albert
8338cb6820 am fb5f4177: Merge "Remove logic for libstdc++ gtest libs." 
* commit 'fb5f41779e67e5d98587f7e1348cae2cf45e719c':
  Remove logic for libstdc++ gtest libs.
 2014-11-10 22:19:13 +00:00
Yabin Cui
35e8e323bc kill HAVE_SCHED_SETSCHEDULER 
Bug: 18300670
Change-Id: I66fb3d0070751ffaa2bc6b53274b22d967350312
 2014-11-10 12:20:15 -08:00
Al Sutton
1199f7388c Fix building on modern versions of Xcode and OS X. 
Add the build options to support the most recent versions of XCode and
add 10.9 to the list of OS X SDKs which the AOSP code can be built with.

Based on patch from https://groups.google.com/d/msg/android-building/kePgJmYBUdM/0C_d1OZflvcJ

Change-Id: I97ffe45d3c54a095952a4ac6accb938623b8fa1e
Signed-off-by: Al Sutton <al@funkyandroid.com>
 2014-11-10 14:42:30 +00:00
Dan Albert
ea93ae61e3 Remove logic for libstdc++ gtest libs. 
The libstdc++ linked gtest libraries are no longer necessary.

Change-Id: Ia98263bc2541b6c8fd0b3e22bb6fec85104a2210
 2014-11-09 00:55:25 -08:00
Ian Rogers
a18a28305d Pass instruction set variant to dex2oat. 
Also, add it to the ANDROID_BUILD_PROPERTIES.
Remove non-default instruction set features.
Bug: 18056890

Change-Id: I9169cdfecbb176f62b941852948222edc3f511fd
 2014-11-08 17:07:23 -08:00
Elliott Hughes
2ddbd98d6f am 65f5175f: am 652ff716: Merge "Remove more namespace pollution (HAVE_TM_GMTOFF)." 
* commit '65f5175f06635d32f16f4057d2df036fa65723a5':
  Remove more namespace pollution (HAVE_TM_GMTOFF).
 2014-11-08 23:42:30 +00:00
Elliott Hughes
65f5175f06 am 652ff716: Merge "Remove more namespace pollution (HAVE_TM_GMTOFF)." 
* commit '652ff716b819b694be76e63f059dca50e7febb8d':
  Remove more namespace pollution (HAVE_TM_GMTOFF).
 2014-11-08 23:38:56 +00:00
Elliott Hughes
b7cca1d4c0 am 954729cc: am 3581753f: Merge "Remove more namespace pollution (HAVE_FUNOPEN)." 
* commit '954729cc17da13a3ca887e51a5de4d9db8f11d16':
  Remove more namespace pollution (HAVE_FUNOPEN).
 2014-11-08 22:22:13 +00:00
Elliott Hughes
89ac6e4c6f Remove more namespace pollution (HAVE_TM_GMTOFF). 
Change-Id: I9c2d7ffb66127c1b73076f8674ecf29aada0fa38
 2014-11-08 14:21:12 -08:00
Elliott Hughes
954729cc17 am 3581753f: Merge "Remove more namespace pollution (HAVE_FUNOPEN)." 
* commit '3581753ffae63e32b2b2e2be1e447cb2e83dec5e':
  Remove more namespace pollution (HAVE_FUNOPEN).
 2014-11-08 22:17:44 +00:00
Elliott Hughes
e5e26e2196 Remove more namespace pollution (HAVE_FUNOPEN). 
Change-Id: I25a64ce39cd7bdd99aa6412413554b96d3cb113e
 2014-11-08 12:39:28 -08:00
Elliott Hughes
23e9b766d6 am 011710ba: am 9e95a0f4: Merge "Remove more namespace pollution." 
* commit '011710ba482e9ed9c45d95947b03d0d04001b995':
  Remove more namespace pollution.
 2014-11-08 19:06:58 +00:00
Elliott Hughes
011710ba48 am 9e95a0f4: Merge "Remove more namespace pollution." 
* commit '9e95a0f4d0172b1669d404c3d605e689234f4dcf':
  Remove more namespace pollution.
 2014-11-08 19:03:04 +00:00
Elliott Hughes
9e95a0f4d0 Merge "Remove more namespace pollution." 2014-11-08 18:55:53 +00:00
Elliott Hughes
b63a7c0dd9 Remove more namespace pollution. 
Nothing in our tree is using this HAVE_BACKTRACE definition, but we do have
a hack in external/llvm to work around the namespace pollution.

Change-Id: Ib51d8bbd598dd2961a028216bf0b489dc7ad4880
 2014-11-08 10:14:19 -08:00
Dan Albert
13d0648860 am 1d235266: am c52eba1f: Merge "Make libc++ the default STL." 
* commit '1d2352661b95348e9be6da9f38433d23a35b57ab':
  Make libc++ the default STL.
 2014-11-07 22:32:16 +00:00
Dan Albert
1d2352661b am c52eba1f: Merge "Make libc++ the default STL." 
* commit 'c52eba1fa23f323b5efeffe1b9aa4c4ab84498b6':
  Make libc++ the default STL.
 2014-11-07 22:16:53 +00:00
Dan Albert
93766b28ce Make libc++ the default STL. 
Previously, code defaulted to using libstdc++ (which was GNU libstdc++
on the host, or Bionic's "libstdc++" on the target). Now we default to
libc++. The exception for this is when using mingw, because we cannot
build libc++ for mingw.

Change-Id: I68726fa26cdcb6263f17c838d3e859debd57fae1
 2014-11-07 13:24:56 -08:00
Ying Wang
f3fb63577b am 2874d0ba: am 87bde62d: Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72." 
* commit '2874d0ba8c71a464629fc148908d8c59854212df':
  Fix error of PRIVATE_LDLIBS introduced by de36cd72.
 2014-11-07 18:41:41 +00:00
Ying Wang
2874d0ba8c am 87bde62d: Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72." 
* commit '87bde62df4e5bb76f058394cd7fff8eaaf7e0d0c':
  Fix error of PRIVATE_LDLIBS introduced by de36cd72.
 2014-11-07 18:37:42 +00:00
Dan Albert
5ea560f90f am 40eb848d: am 18e6b280: Merge "Missed a dependency on pthreads." 
* commit '40eb848d7d4b758335640072d45150545c6f77c5':
  Missed a dependency on pthreads.
 2014-11-07 18:36:53 +00:00
Dan Albert
40eb848d7d am 18e6b280: Merge "Missed a dependency on pthreads." 
* commit '18e6b2800158bb92a102aaaef812cabdddf00683':
  Missed a dependency on pthreads.
 2014-11-07 18:32:49 +00:00
Ying Wang
2ad87ebf26 Fix error of PRIVATE_LDLIBS introduced by de36cd72. 
Change-Id: I85644899c8527e061c331eecc707ca1bb0e3fac4
 2014-11-07 10:05:03 -08:00
Dan Albert
18e6b28001 Merge "Missed a dependency on pthreads." 2014-11-07 17:35:26 +00:00
Ying Wang
26a4278db4 am 73b4d38b: Merge "Update build ID to AOSP" 
* commit '73b4d38b53ae69dc2ee620b8aaf89df760a48398':
  Update build ID to AOSP
 2014-11-07 17:31:58 +00:00
Chirayu Desai
9a1f47c7c6 Update build ID to AOSP 
and display the build number

Change-Id: Ib2f9964b87f591cae235e5094a7f14c897c1872d
 2014-11-07 16:10:17 +05:30
Sami Tolvanen
72d90eb189 Change verity key formats 
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.

Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
 2014-11-06 20:40:07 -08:00
Ying Wang
b630279056 am 3f03b0d5: am a69e5962: am 478eda53: Merge "FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT." 
* commit '3f03b0d5515f4c90dff8511f9369373a29efb832':
  FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
 2014-11-07 04:16:07 +00:00
Dan Albert
5cab04ffd2 Missed a dependency on pthreads. 
Change-Id: I060c9c65b07efe89a308fccf71a1096424a7de39
 2014-11-06 17:32:25 -08:00
Ying Wang
3f03b0d551 am a69e5962: am 478eda53: Merge "FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT." 
* commit 'a69e59623b25bf53d07f044db12c7ad9e3635c06':
  FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
 2014-11-07 01:03:32 +00:00
Ying Wang
a69e59623b am 478eda53: Merge "FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT." 
* commit '478eda5365f866c830f957d6bd1aba3854d55bcc':
  FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
 2014-11-07 00:58:32 +00:00
Ying Wang
e5d4e74f9f FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT. 
Because we don't have 32-bit prebuilt libLLVM/libclang.

Change-Id: I86dac33e9bcbcb3d197f7d1e4c9d33bd4e7c473e
 2014-11-06 14:11:33 -08:00
Chih-Hung Hsieh
3be11c6e61 Upgrade host tool to x86_64-linux-glibc2.15-4.8 
BUG: 17915392
Change-Id: I301b8ae70fabedfafea5ae0094bbd46c208f4622
 2014-11-06 11:47:08 -08:00
Ian Rogers
0b162624c6 am 4606ae77: am b78348d5: am 5968de73: Merge "Remove stale dexopt flags." 
* commit '4606ae776b628a3021dc3a82fb0699f68e30921c':
  Remove stale dexopt flags.
 2014-11-06 00:22:14 +00:00
Ian Rogers
4606ae776b am b78348d5: am 5968de73: Merge "Remove stale dexopt flags." 
* commit 'b78348d5b49ab2899b414d5700f0d7e6e797dfc6':
  Remove stale dexopt flags.
 2014-11-06 00:12:02 +00:00
Ian Rogers
b78348d5b4 am 5968de73: Merge "Remove stale dexopt flags." 
* commit '5968de73fb78e2ca8f32ab0588cac92f74a0435e':
  Remove stale dexopt flags.
 2014-11-06 00:05:36 +00:00
Ian Rogers
9c7fc4b325 Remove stale dexopt flags. 
Change-Id: Ib58d39012eabd5f854b9434ab922340fcfe43b57
 2014-11-05 14:53:53 -08:00
Ying Wang
f605e5aa80 am ac0dbab7: am 9aad363e: am 7a301af1: Merge "Force colorsheme to SVG, since darkblue doesn\'t exist on X11" 
* commit 'ac0dbab7e6744ee9c8159abd38efd15aaa7209e8':
  Force colorsheme to SVG, since darkblue doesn't exist on X11
 2014-11-05 20:16:13 +00:00
Ying Wang
5778600fd0 am 11186695: am b45f7c35: am 8683612f: Merge "definitions.mk: look for definitions.mk in device/*/build also" 
* commit '111866953a95324b7ba342f92f14de2b7c35de24':
  definitions.mk: look for definitions.mk in device/*/build also
 2014-11-05 20:16:12 +00:00
Ying Wang
ac0dbab7e6 am 9aad363e: am 7a301af1: Merge "Force colorsheme to SVG, since darkblue doesn\'t exist on X11" 
* commit '9aad363e8d629d2ff56ccc30ac6bd95336d2d3c3':
  Force colorsheme to SVG, since darkblue doesn't exist on X11
 2014-11-05 19:09:19 +00:00
Ying Wang
111866953a am b45f7c35: am 8683612f: Merge "definitions.mk: look for definitions.mk in device/*/build also" 
* commit 'b45f7c35b138c5b27f4c2528f7f699a59098809e':
  definitions.mk: look for definitions.mk in device/*/build also
 2014-11-05 19:09:18 +00:00
Ying Wang
9aad363e8d am 7a301af1: Merge "Force colorsheme to SVG, since darkblue doesn\'t exist on X11" 
* commit '7a301af1e0a3d590e42d3317940e65f739b9f930':
  Force colorsheme to SVG, since darkblue doesn't exist on X11
 2014-11-05 19:01:48 +00:00
Ying Wang
b45f7c35b1 am 8683612f: Merge "definitions.mk: look for definitions.mk in device/*/build also" 
* commit '8683612fbd15640ae59daf7ba7c36e1f2ff8e687':
  definitions.mk: look for definitions.mk in device/*/build also
 2014-11-05 19:01:47 +00:00
Ying Wang
7a301af1e0 Merge "Force colorsheme to SVG, since darkblue doesn't exist on X11" 2014-11-05 18:36:36 +00:00
Ying Wang
8683612fbd Merge "definitions.mk: look for definitions.mk in device/*/build also" 2014-11-05 17:50:00 +00:00
Stephen Hines
75ff9b8d10 am a729f618: am f1c5dd60: am 35e4ede5: Merge "Use automatic color option with the latest clang." 
* commit 'a729f6187ab33dce008adc9965f33fd634db9efc':
  Use automatic color option with the latest clang.
 2014-11-04 17:57:14 +00:00
Stephen Hines
a729f6187a am f1c5dd60: am 35e4ede5: Merge "Use automatic color option with the latest clang." 
* commit 'f1c5dd60b2d1721e8f5d974f89323eac09795d64':
  Use automatic color option with the latest clang.
 2014-11-04 17:51:26 +00:00
Stephen Hines
f1c5dd60b2 am 35e4ede5: Merge "Use automatic color option with the latest clang." 
* commit '35e4ede5974053d05ae0f8791e60ba77a31907b3':
  Use automatic color option with the latest clang.
 2014-11-04 17:44:44 +00:00
Stephen Hines
c141b85ef1 Use automatic color option with the latest clang. 
Bug: 18187181

Now that I checked in the latest prebuilts, clang will automatically use
color on terminals and no color on redirection to files or non-terminals.

Change-Id: I9be00c44947946cc18ce59c936b7f45d0ce2b6fc
 2014-11-03 23:42:10 -08:00
Ying Wang
f4053c70e4 am 007026f0: am 3fe170c5: Merge "Add support for prebuilt AARs." into lmp-mr1-ub-dev 
* commit '007026f0ebf2216d875b9fdab44cc68b659e2307':
  Add support for prebuilt AARs.
 2014-11-03 18:11:53 +00:00
Ying Wang
007026f0eb am 3fe170c5: Merge "Add support for prebuilt AARs." into lmp-mr1-ub-dev 
* commit '3fe170c51ea1eca253164fa8738ab42b5b9aaa6b':
  Add support for prebuilt AARs.
 2014-11-03 18:07:45 +00:00
Nick Kralevich
0a5105bd25 am e4cbc2af: Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev 
* commit 'e4cbc2af5f476d9eb875253584260bed807acddf':
  Revert "Add support for prebuilt AARs."
 2014-11-02 16:53:29 +00:00
Ying Wang
e9dd9f2bfc Add support for prebuilt AARs. 
- You can give a .aar as source file to a prebuilt static Java library
  module. The build system will set up dependencies and rules to extract
  classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
  LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
  The build system will set up rules to merge the library's
  AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
  resource dirs and link/merge the AAR's classes.jar.

Bug: 18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
 2014-11-02 16:51:49 +00:00
Nick Kralevich
36fd476843 Revert "Add support for prebuilt AARs." 
master doesn't compile anymore.

This reverts commit f567292504.

Change-Id: Icc16fe5360d1222740b803e9dd006081e3c66e46
(cherry picked from commit bcf8683b29)
 2014-11-02 05:26:14 +00:00
Nick Kralevich
e4cbc2af5f Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev 2014-11-02 05:15:26 +00:00
Nick Kralevich
bcf8683b29 Revert "Add support for prebuilt AARs." 
master doesn't compile anymore.

This reverts commit f567292504.

Change-Id: Icc16fe5360d1222740b803e9dd006081e3c66e46
 2014-11-02 05:11:11 +00:00
Igor Murashkin
315fed1300 am 5ef20b40: am e1ab1b5e: am 4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev 
* commit '5ef20b406ca6e25f01f56b750a3c9d249fc9eca8':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
 2014-11-01 00:37:10 +00:00
Igor Murashkin
5ef20b406c am e1ab1b5e: am 4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev 
* commit 'e1ab1b5e47cd464d39e406b982b26dd755f2def6':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
 2014-11-01 00:33:07 +00:00
Igor Murashkin
e1ab1b5e47 am 4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev 
* commit '4c93719e3010d39c212e73c975a27ec76d4c1fb0':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
 2014-10-31 22:44:15 +00:00
Ying Wang
5ba418c00a am be6a3db2: Merge "Introduce per-product per-module dex-preopt config" into lmp-mr1-dev 
* commit 'be6a3db20b5d2242bc3b459c5b69b1d8ef86aa54':
  Introduce per-product per-module dex-preopt config
 2014-10-31 21:48:56 +00:00
Igor Murashkin
da9f1a7e82 core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files 
When WITH_DEXPREOPT=true is set, if we also set WITH_DEXPREOPT_PIC=true
then the build will generate position-independent OAT images.

This means that all the system applications no longer need to be
relocated into /data/dalvik-cache and this can achieve saving disk space
at the cost of slightly slower running code.

Bug: 18035729
Change-Id: Ifd517c842f48bf31568bf5ff56667298d422c2c0
 2014-10-31 14:30:42 -07:00
Ying Wang
70d617aaf5 Introduce per-product per-module dex-preopt config 
- Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat.
- Added macro add-product-dex-preopt-module-config to specify almost
  arbitrary dex-preopt config/flags to modules in product
  configuration:
  $(call \
  add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>)
  How <config_or_flags> is interpreted is decided by
  dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we
  disable dexpreopt for the given modules; otherwise pass it to dex2oat as
  command line flags.
- If there are multiple configs for the same module in the product
  inheritance, the first takes precedence.
- Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default
  dex2oat flags in product configuration.
- Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat.

Bug: 17791867
(cherry picked from commit 20ebd2ef08)

Change-Id: I2ee36892b40655c96837ee7a663dda1d25830878
 2014-10-31 10:12:54 -07:00
Ying Wang
df95d8c1f7 am 4ef8133a: am f5672925: Add support for prebuilt AARs. 
* commit '4ef8133a421dd92c6feb0508bc2274f12576cfd2':
  Add support for prebuilt AARs.
 2014-10-31 00:20:31 +00:00
Ying Wang
4ef8133a42 am f5672925: Add support for prebuilt AARs. 
* commit 'f56729250448200834c5c95c86c937e887d73623':
  Add support for prebuilt AARs.
 2014-10-31 00:13:50 +00:00
Ying Wang
5431ea2ce0 am 75a7d3a6: am 7f18adc2: am 871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags." 
* commit '75a7d3a620a7600bed6510a540514d15817046f3':
  Add -fcolor-diagnostics to global clang cflags.
 2014-10-30 23:50:34 +00:00
Ying Wang
75a7d3a620 am 7f18adc2: am 871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags." 
* commit '7f18adc240ca311d225ee9164e6d982f9a005d62':
  Add -fcolor-diagnostics to global clang cflags.
 2014-10-30 23:46:08 +00:00
Ying Wang
7f18adc240 am 871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags." 
* commit '871b8df128b144f39d40889e463722a032c4d246':
  Add -fcolor-diagnostics to global clang cflags.
 2014-10-30 23:43:02 +00:00
Ying Wang
c7d1a973b0 Add -fcolor-diagnostics to global clang cflags. 
Bug: 18187181
Change-Id: Ifcbe34b685b1dfd7ffc801bcdad7bd8208e45f86
 2014-10-30 12:22:29 -07:00
Chih-hung Hsieh
a5d7970715 am 18340084: am 51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE." 
* commit '18340084172b98e44e44d994a2c326b2157c6c49':
  Revert "Continue to use march=i686 before fix of g++ ICE."
 2014-10-30 18:38:51 +00:00
Chih-hung Hsieh
1834008417 am 51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE." 
* commit '51e55c1d22576de38ca4b65deaded7b3a1af8387':
  Revert "Continue to use march=i686 before fix of g++ ICE."
 2014-10-30 16:08:20 +00:00
Chih-hung Hsieh
51e55c1d22 Revert "Continue to use march=i686 before fix of g++ ICE." 
This reverts commit f70f009ca8.

Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6
 2014-10-30 01:55:45 +00:00
Ying Wang
f567292504 Add support for prebuilt AARs. 
- You can give a .aar as source file to a prebuilt static Java library
  module. The build system will set up dependencies and rules to extract
  classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
  LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
  The build system will set up rules to merge the library's
  AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
  resource dirs and link/merge the AAR's classes.jar.

Bug: 18168693
Change-Id: I478913d5d498f800b322529d7c2c2c0ea78425e5
 2014-10-29 23:40:52 +00:00
Chih-Hung Hsieh
23103f4fa9 am f70f009c: Continue to use march=i686 before fix of g++ ICE. 
* commit 'f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b':
  Continue to use march=i686 before fix of g++ ICE.
 2014-10-29 22:07:26 +00:00
Chih-Hung Hsieh
f70f009ca8 Continue to use march=i686 before fix of g++ ICE. 
BUG: 18174291
BUG: 18171557
Change-Id: Ica9e420e3cc1904a4298e2ab1c6201a254cbf6d1
 2014-10-29 14:46:15 -07:00
Chih-Hung Hsieh
5071eb750a Merge "Continue to use march=i686 before fix of g++ ICE." 2014-10-29 21:36:21 +00:00
Chih-Hung Hsieh
be971fc19b Continue to use march=i686 before fix of g++ ICE. 
BUG: 18174291
Change-Id: Idb76afd715b7b7049b9e47f92f2658f6923c8448
 2014-10-29 13:57:33 -07:00
Jeff Davidson
79ddea19f6 am 4e466096: am ed9981d9: am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit '4e4660961b6c704d13c6c521f36958f436ec40f3':
  Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
 2014-10-29 20:52:18 +00:00
Jeff Davidson
4e4660961b am ed9981d9: am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit 'ed9981d927cb24b106df9b3c350b6b63e570026f':
  Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
 2014-10-29 20:42:11 +00:00
Ian Rogers
5f60710fc9 am c156f68c: am 508e27bf: am 93cb8c7d: Merge "Specify -mcpu=krait for clang." 
* commit 'c156f68cffdbd4bfd0c064d99e9968c466bb7309':
  Specify -mcpu=krait for clang.
 2014-10-29 19:56:48 +00:00
Ian Rogers
c156f68cff am 508e27bf: am 93cb8c7d: Merge "Specify -mcpu=krait for clang." 
* commit '508e27bfd7f470a945978c2b24403b0827dcde18':
  Specify -mcpu=krait for clang.
 2014-10-29 19:43:16 +00:00
Jeff Davidson
ed9981d927 am 427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit '427d1e98eceb78f5cb8f1e50d00d342fc7f359c6':
  Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
 2014-10-29 17:40:05 +00:00
Jeff Davidson
427d1e98ec Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE." 2014-10-29 17:35:17 +00:00
Neil Fuller
0333e90517 am 4b642748: am acd65c7d: am 97ef1d46: Merge "Add OpenJDK 8 experimental support" 
* commit '4b642748dd41d8bd1f7a2c8de6e467a01cabae43':
  Add OpenJDK 8 experimental support
 2014-10-29 17:32:13 +00:00
Chih-Hung Hsieh
8179594a73 am 9fd84692: am 736a146c: am 717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS." 
* commit '9fd8469237cc2ac6487b64d6d300d7d2ec3f59ac':
  Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
 2014-10-29 17:32:11 +00:00
Dan Albert
47bb921e00 am d905ec2a: am ef8912d9: am d274e04a: Merge "Don\'t sort shared library link order." 
* commit 'd905ec2ac6b1277d59b21b74f8632c34fdf1b9a9':
  Don't sort shared library link order.
 2014-10-29 17:32:10 +00:00
Chih-Hung Hsieh
66cca24a2c am 3b5261ac: am 6555580d: am ea503d21: Merge "Raise x86 arch requirement to prescott." 
* commit '3b5261ac75f7d8d912e92fcdfdd76534a9bbe41b':
  Raise x86 arch requirement to prescott.
 2014-10-29 17:32:09 +00:00
Neil Fuller
c6adac18fe am c5c60e2c: am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support" 
* commit 'c5c60e2c2af542294d38dc0e2284115a62dbb310':
  Remove Java 6 build support
 2014-10-29 17:32:08 +00:00
Neil Fuller
4b642748dd am acd65c7d: am 97ef1d46: Merge "Add OpenJDK 8 experimental support" 
* commit 'acd65c7db0212bff2b7b1878a26b7a105522cd44':
  Add OpenJDK 8 experimental support
 2014-10-29 17:11:52 +00:00
Chih-Hung Hsieh
9fd8469237 am 736a146c: am 717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS." 
* commit '736a146c3c44b6b753e0b7866d3f0f43e9be76e5':
  Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
 2014-10-29 17:11:51 +00:00
Dan Albert
d905ec2ac6 am ef8912d9: am d274e04a: Merge "Don\'t sort shared library link order." 
* commit 'ef8912d93f5ca3722d761da6c0b0f05e2480a41d':
  Don't sort shared library link order.
 2014-10-29 17:11:50 +00:00
Chih-Hung Hsieh
3b5261ac75 am 6555580d: am ea503d21: Merge "Raise x86 arch requirement to prescott." 
* commit '6555580d35ac570005923866fb4035265a0b5b98':
  Raise x86 arch requirement to prescott.
 2014-10-29 17:11:49 +00:00
Neil Fuller
c5c60e2c2a am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support" 
* commit 'f7ce9508dec85c67d3a2ebe84db073a01355eba5':
  Remove Java 6 build support
 2014-10-29 17:11:24 +00:00
Chih-Hung Hsieh
bb9b74d88c am 0704df6c: am 54fd82d1: am 660f3c9a: Merge "Set default to Clang integrated assembler." 
* commit '0704df6c6182bb7313f2faa5ab64fa4b726f9ad6':
  Set default to Clang integrated assembler.
 2014-10-29 16:47:09 +00:00
Chih-Hung Hsieh
0704df6c61 am 54fd82d1: am 660f3c9a: Merge "Set default to Clang integrated assembler." 
* commit '54fd82d111113c7969052cd315cc71bd31b4e161':
  Set default to Clang integrated assembler.
 2014-10-29 16:42:52 +00:00
Ian Rogers
508e27bfd7 am 93cb8c7d: Merge "Specify -mcpu=krait for clang." 
* commit '93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
  Specify -mcpu=krait for clang.
 2014-10-29 12:32:37 +00:00