Elliott Hughes
c679451484
am 31f21208
: am cb0755f8
: Merge "Remove unused HAVE_OFF64_T."
...
* commit '31f2120848d2dcbbe3f2571ce9993d3dabff490f':
Remove unused HAVE_OFF64_T.
2014-09-23 21:37:19 +00:00
Elliott Hughes
f811b82b4d
am 31f21208
: am cb0755f8
: Merge "Remove unused HAVE_OFF64_T."
...
* commit '31f2120848d2dcbbe3f2571ce9993d3dabff490f':
Remove unused HAVE_OFF64_T.
2014-09-23 21:37:05 +00:00
Elliott Hughes
31f2120848
am cb0755f8
: Merge "Remove unused HAVE_OFF64_T."
...
* commit 'cb0755f8c92c252331614bee7bceeb897357e0f1':
Remove unused HAVE_OFF64_T.
2014-09-23 21:30:09 +00:00
Elliott Hughes
8fe8dc83e3
Remove unused HAVE_OFF64_T.
...
Change-Id: I24acf64efcd0fd84d5dda342d4c4293fa59fae1a
2014-09-23 13:36:01 -07:00
Elliott Hughes
eb06275e16
am c1dd3578
: am 5d76f9e8
: am 88c7544e
: Merge "Remove the unused IPC macros."
...
* commit 'c1dd3578a7a014be94f57a3d64cf389db9edec3d':
Remove the unused IPC macros.
2014-09-23 19:08:01 +00:00
Elliott Hughes
b1db3ccef8
am ff9fd2c3
: am 50bd6b99
: am c65d93f6
: Merge "build: remove HAVE_OOM_ADJ"
...
* commit 'ff9fd2c3edc5db2f7fd15d17bee083d4b2006327':
build: remove HAVE_OOM_ADJ
2014-09-23 16:20:23 +00:00
Elliott Hughes
c1dd3578a7
am 5d76f9e8
: am 88c7544e
: Merge "Remove the unused IPC macros."
...
* commit '5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
Remove the unused IPC macros.
2014-09-23 16:17:33 +00:00
Elliott Hughes
0b1529d064
am 5d76f9e8
: am 88c7544e
: Merge "Remove the unused IPC macros."
...
* commit '5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
Remove the unused IPC macros.
2014-09-23 16:16:48 +00:00
Elliott Hughes
5d76f9e8c8
am 88c7544e
: Merge "Remove the unused IPC macros."
...
* commit '88c7544e711e70273b3ab29251ba2ff359a7ea1a':
Remove the unused IPC macros.
2014-09-23 16:11:03 +00:00
Elliott Hughes
76ab00f189
Remove the unused IPC macros.
...
There are still a couple of references to HAVE_WIN32_IPC to be dealt with
later.
Change-Id: Id131fbf2e96d4c1c7bb98629779045375bd5f85f
2014-09-22 20:43:32 -07:00
Elliott Hughes
c08b4f0389
am 50bd6b99
: am c65d93f6
: Merge "build: remove HAVE_OOM_ADJ"
...
* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
build: remove HAVE_OOM_ADJ
2014-09-23 02:09:15 +00:00
Elliott Hughes
ff9fd2c3ed
am 50bd6b99
: am c65d93f6
: Merge "build: remove HAVE_OOM_ADJ"
...
* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
build: remove HAVE_OOM_ADJ
2014-09-23 02:07:01 +00:00
Elliott Hughes
50bd6b9979
am c65d93f6
: Merge "build: remove HAVE_OOM_ADJ"
...
* commit 'c65d93f6964a313f64fee031d8dcdbe996a7204d':
build: remove HAVE_OOM_ADJ
2014-09-23 01:54:23 +00:00
Todd Poynor
9c226d1f9e
build: remove HAVE_OOM_ADJ
...
This define is no longer used.
Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
2014-09-22 18:47:48 -07:00
Dianne Hackborn
105df2f1d2
And then L, without ever becoming a real code name, transforms like magic to 5.0.
...
The code name looked at 5.0 despondently. "Won't anyone care about
me? Why does everyone pretend like I don't even exist!" And it
was true -- for all of its life, nobody had ever whispered L's
true name, at least not in the same breath as many other names that
were not L's at all.
But 5.0 knew better. "L," the number said, "don't you fear. Some
day, I am sure, your name will go up in lights. Your name will shine
brighter than even my own. And everyone who is anyone will know
your name, write pages and pages all about your name, and debate
endlessly about everything you are."
L could only hope this would be true. But not today. Today, L
is still nobody.
Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8
2014-09-22 15:55:23 -07:00
Ying Wang
4cb0499a5d
Allow LOCAL_ASSET_DIR point to nonexistent dir
...
LOCAL_ASSET_DIR may point to a dir generated during the build process.
We have done similiar things to LOCAL_RESOURCE_DIR.
(cherry picked from commit bfcdf060ba
)
Bug: 16563899
Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
2014-09-20 14:16:09 -07:00
Ying Wang
d7b3c2c595
am b4c83767
: am a7ee956e
: am b69b7d7f
: Merge "Fix recovery image build for 32p"
...
* commit 'b4c837672fe730652e4c7d32bea1f9e7673d180b':
Fix recovery image build for 32p
2014-09-20 03:20:12 +00:00
Ying Wang
b4c837672f
am a7ee956e
: am b69b7d7f
: Merge "Fix recovery image build for 32p"
...
* commit 'a7ee956e9dc20fa5a01606b473b18b0c3980762f':
Fix recovery image build for 32p
2014-09-20 03:01:28 +00:00
Ying Wang
0379e9f83f
am a7ee956e
: am b69b7d7f
: Merge "Fix recovery image build for 32p"
...
* commit 'a7ee956e9dc20fa5a01606b473b18b0c3980762f':
Fix recovery image build for 32p
2014-09-20 01:06:48 +00:00
Ying Wang
a7ee956e9d
am b69b7d7f
: Merge "Fix recovery image build for 32p"
...
* commit 'b69b7d7fba2a03faa1405da5bde9b6b559c758b2':
Fix recovery image build for 32p
2014-09-20 00:49:36 +00:00
Ying Wang
b69b7d7fba
Merge "Fix recovery image build for 32p"
2014-09-20 00:38:08 +00:00
Elliott Hughes
2cf3f3afdf
am 6666562c
: am a4a57339
: am e2f54706
: Merge "Remove unused HAVE_EPOLL."
...
* commit '6666562c275f854efbab580ad16ab7b38932fdf3':
Remove unused HAVE_EPOLL.
2014-09-19 23:41:08 +00:00
Brian Carlstrom
9648a0f5f1
am da51aa7a
: am 8c444b61
: am b97b1e59
: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
...
* commit 'da51aa7a13bdedfec4d35f57371fbda3d56f8904':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
2014-09-19 23:29:59 +00:00
Elliott Hughes
6666562c27
am a4a57339
: am e2f54706
: Merge "Remove unused HAVE_EPOLL."
...
* commit 'a4a57339f3de18ee3fef962fea925962a49b26a3':
Remove unused HAVE_EPOLL.
2014-09-19 23:17:04 +00:00
Elliott Hughes
ae9c91b8b1
am a4a57339
: am e2f54706
: Merge "Remove unused HAVE_EPOLL."
...
* commit 'a4a57339f3de18ee3fef962fea925962a49b26a3':
Remove unused HAVE_EPOLL.
2014-09-19 23:11:08 +00:00
Elliott Hughes
a4a57339f3
am e2f54706
: Merge "Remove unused HAVE_EPOLL."
...
* commit 'e2f547060678ed4199b9f398b95643e08e6b6959':
Remove unused HAVE_EPOLL.
2014-09-19 23:02:38 +00:00
Elliott Hughes
e2f5470606
Merge "Remove unused HAVE_EPOLL."
2014-09-19 22:54:17 +00:00
Elliott Hughes
67839a58be
Remove unused HAVE_EPOLL.
...
The only people who appear to be using this are actually using their own
one.
Change-Id: I349ed4ce3874c1b2f9bad56c93c8ccee88ae9432
2014-09-19 15:12:56 -07:00
Brian Carlstrom
4d0595b596
am 8c444b61
: am b97b1e59
: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
...
* commit '8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
2014-09-19 22:01:46 +00:00
Brian Carlstrom
da51aa7a13
am 8c444b61
: am b97b1e59
: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
...
* commit '8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
2014-09-19 22:01:42 +00:00
Brian Carlstrom
8c444b61b3
am b97b1e59
: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
...
* commit 'b97b1e59409ea4b873dbb8d83ba73f978ba7fcba':
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
2014-09-19 21:49:13 +00:00
Brian Carlstrom
b97b1e5940
Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
2014-09-19 21:41:01 +00:00
Dehao Chen
c7ed00fc00
Add global option filtering for FDO builds.
...
Change-Id: I95e797f7f5945bb34061d17e49156ca8c8a19854
2014-09-19 11:55:33 -07:00
Brian Carlstrom
85d56eba99
Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
...
Bug: 17572009
Change-Id: I0cfc1aa2dd93a8dac21d23d813801c74ed37079a
2014-09-19 11:30:27 -07:00
Dan Albert
38b8c39e4d
am 46edd9b1
: am 92421720
: am 98f7742a
: Merge "Move selection of C++ STL into the build system."
...
* commit '46edd9b1035da5752e516e818db378554e1e0144':
Move selection of C++ STL into the build system.
2014-09-19 08:32:11 +00:00
Vineeta Srivastava
5cb80db37d
am cfbd193d
: am 2726211a
: Set oem_fingerprint_properties only when it is not empty.
...
* commit 'cfbd193d354dd9bf33148919a4a82678ed81578b':
Set oem_fingerprint_properties only when it is not empty.
2014-09-19 08:32:04 +00:00
Dan Albert
220b01ba27
am 92421720
: am 98f7742a
: Merge "Move selection of C++ STL into the build system."
...
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
Move selection of C++ STL into the build system.
2014-09-19 00:16:16 +00:00
Dan Albert
46edd9b103
am 92421720
: am 98f7742a
: Merge "Move selection of C++ STL into the build system."
...
* commit '9242172094691c7203ba7cf0a5e5db611ca9032b':
Move selection of C++ STL into the build system.
2014-09-19 00:15:23 +00:00
Dan Albert
9242172094
am 98f7742a
: Merge "Move selection of C++ STL into the build system."
...
* commit '98f7742a7f5bdc69913ba5e15bba2e60ae5cf724':
Move selection of C++ STL into the build system.
2014-09-19 00:06:28 +00:00
Dan Albert
b05f2ca150
Move selection of C++ STL into the build system.
...
Preparing for migration from stlport to libc++. STL selection is done
with LOCAL_CXX_STL (valid values are default, none, libc++,
libc++_static, stlport, stlport_static, bionic).
The selection of the STL is as follows:
if LOCAL_CXX_STL == 'default'
ifdef LOCAL_SDK_VERSION
Use whatever STL the other NDK options have selected.
else
Use bionic's libstdc++ for target, GNU libstdc++ for host. This
is compatible with the existing build options.
endif
else
if LOCAL_CXX_STL == 'stlport'
Use stlport.
else if LOCAL_CXX_STL == 'libc++'
Use libc++.
else if LOCAL_CXX_STL == ''
Don't use any STL.
endif
endif
Bug: 15193147
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
2014-09-18 16:38:20 -07:00
Vineeta Srivastava
cfbd193d35
am 2726211a
: Set oem_fingerprint_properties only when it is not empty.
...
* commit '2726211a7c843ccea3b345c0821290a5ee656d9b':
Set oem_fingerprint_properties only when it is not empty.
2014-09-18 22:46:23 +00:00
Vineeta Srivastava
ed719782b6
am 2726211a
: Set oem_fingerprint_properties only when it is not empty.
...
* commit '2726211a7c843ccea3b345c0821290a5ee656d9b':
Set oem_fingerprint_properties only when it is not empty.
2014-09-18 22:19:09 +00:00
Vineeta Srivastava
2726211a7c
Set oem_fingerprint_properties only when it is not empty.
...
Add oem_fingerprint_properties to misc_info.txt only when it is not empty.
Shamu does not have OEM specific OTA config and oem_fingerprint_properties
does not need to be set in misc_info.txt.
For sprout, it stays the same.
Bug: 16635599
Change-Id: I7e6c6f5ce1f94f8f1b6da0c2f56bc67ff9fc0f1c
2014-09-18 14:42:28 -07:00
Przemyslaw Szczepaniak
fabd383bc8
Switch NDK libraries to 4.9 for x86_64 and mips64
...
Android NDK r10b doesn't even provide 4.8 for those
archs.
Change-Id: I10840c6c7bbc0dd9028a794162d021d8b3e6b19a
2014-09-16 15:17:47 +01:00
Ying Wang
84b9e94395
am e7296eb2
: am 7a899199
: Enable multilib odex only if TARGET_2ND_ARCH is defined.
...
* commit 'e7296eb23fd43aec155dc857e6ee2bc3875cf340':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
2014-09-16 08:53:20 +00:00
Ying Wang
752e6bcaad
am e085cdda
: am 88cfa032
: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
...
* commit 'e085cdda0ace500c511b75bcf6c9aa06fbb18050':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
2014-09-16 08:50:00 +00:00
Ying Wang
e7296eb23f
am 7a899199
: Enable multilib odex only if TARGET_2ND_ARCH is defined.
...
* commit '7a8991991f6459945782175b0cda7d03fbf6cbde':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
2014-09-16 08:32:18 +00:00
Ying Wang
e085cdda0a
am 88cfa032
: Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined."
...
* commit '88cfa0324724c7e90bfed3aaa61c27ca0926860b':
Enable multilib odex only if TARGET_2ND_ARCH is defined.
2014-09-16 08:22:27 +00:00
Ying Wang
66ee934c91
am 8209d993
: Merge "Support to build apk odex for both arch."
...
* commit '8209d993da63dcf3ac6b3e9d236e2baf0fcd51a0':
Support to build apk odex for both arch.
2014-09-16 08:22:26 +00:00
Bruce Beare
7c02ec91e8
Fix recovery image build for 32p
...
When building for 32p, we need to be explicit that we wish to build the 32bit
version of the binaries that will be placed in the recovery image. The recovery
image doesn't actually care... but if we are not explicit in this, the makefiles
will ask for the 64bit binaries but the Android.mk for the binaries will supply
the 32bit images (causing the build to fail)..
Change-Id: I728912bc8e07726888fe8bed4352cbb373911cb7
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
2014-09-15 18:36:47 -07:00