StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,859 Commits 1 Branch 0 Tags
c08b4f03896ac996dcd83b5d37f80198e69fc37c
Commit Graph

19859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
50bd6b9979 am c65d93f6: Merge "build: remove HAVE_OOM_ADJ" 
* commit 'c65d93f6964a313f64fee031d8dcdbe996a7204d':
  build: remove HAVE_OOM_ADJ
 2014-09-23 01:54:23 +00:00
Elliott Hughes
c65d93f696 Merge "build: remove HAVE_OOM_ADJ" 2014-09-23 01:49:10 +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
Ying Wang
43928a00fb am cccbcfe7: (-s ours) am c5a99042: Merge "Use "" to preserve argument word breaks" 
* commit 'cccbcfe753d19b07eeef02c274d46ef987bedfbf':
  Use "$@" to preserve argument word breaks
 2014-09-22 17:08:49 +00:00
Ying Wang
cccbcfe753 am c5a99042: Merge "Use "" to preserve argument word breaks" 
* commit 'c5a99042e944787b2cd5f2e93ba4775ffd9e36fc':
  Use "$@" to preserve argument word breaks
 2014-09-22 16:50:14 +00:00
Ying Wang
c5a99042e9 Merge "Use "$@" to preserve argument word breaks" 2014-09-22 16:42:34 +00:00
Ying Wang
850ca0db5e Use "$@" to preserve argument word breaks 
This fixes mmma broken due to quotes stripped in the argument passing.

(cherry picked from commit dcc8b3729d)

Change-Id: Ic8c4bb8e7cb347c1f80b5bc1648f63e58a010e8d
 2014-09-22 17:13:08 +02:00
Ying Wang
d0b1a55424 am 4cb0499a: Allow LOCAL_ASSET_DIR point to nonexistent dir 
* commit '4cb0499a5d6875fc13107f237779fb0422b4f7f2':
  Allow LOCAL_ASSET_DIR point to nonexistent dir
 2014-09-20 22:23:41 +00: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
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
Bill Yi
6d3f081e08 am e3386105: Remove PinyinIME from target config 
* commit 'e3386105e31971378386ef2fe8480aacfc082ea0':
  Remove PinyinIME from target config
 2014-09-20 00:02:19 +00:00
Bill Yi
6d057b69ef am 5855c216: (-s ours) am 70d3c707: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE" 
* commit '5855c2161a6cd93fb62c6d2326d9e2f7517f7fa7':
  Remove PinyinIME from target config - DO NOT MERGE
 2014-09-20 00:02:15 +00:00
Bill Yi
5855c2161a am 70d3c707: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE" 
* commit '70d3c707caa45968508d45c703b0edb13199b5ea':
  Remove PinyinIME from target config - DO NOT MERGE
 2014-09-19 23:46:29 +00:00
Bill Yi
70d3c707ca Merge "Remove PinyinIME from target config - DO NOT MERGE" 2014-09-19 23:36:04 +00:00
Bill Yi
8b244b3f84 Remove PinyinIME from target config - DO NOT MERGE 
BUG:17578207
 2014-09-19 16:12:46 -07: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
Bill Yi
e3386105e3 Remove PinyinIME from target config 
BUG:17578207
 2014-09-19 16:04:17 -07: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
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
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
Michael Runge
5d40afe7f2 am 7914651f: Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev 
* commit '7914651f70a1a23c5f822a035c09054dc4ad3d38':
  If oem_fingerprint_props is empty, ignore.
 2014-09-19 04:41:22 +00:00
Michael Runge
7914651f70 Merge "If oem_fingerprint_props is empty, ignore." into lmp-dev 2014-09-19 04:22:36 +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
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
98f7742a7f Merge "Move selection of C++ STL into the build system." 2014-09-18 23:51:53 +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
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
Michael Runge
560569a617 If oem_fingerprint_props is empty, ignore. 
There may be cases where there is an OEM partition
but it has no effect on the OTA itself.  In these
cases, ignore an empty value from the misc_info.txt

Change-Id: I5f467e873030765af12810a07ddd5f302ca8cc0b
 2014-09-18 15:12:45 -07: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
Qiwen Zhao
5726fec530 Merge commit 'e866294e' into lmp-dev-plus-aosp 
Conflicts:
	tools/droiddoc/templates-sac/assets/images/sac_logo.png
 2014-09-18 12:19:51 -07:00
Clay Murphy
e866294eec am ef3148c1: Merge "Docs: Replacing s.a.c. Android logo to match other sites." 
* commit 'ef3148c1fa2173a6ed5c4f7a02955acddf88d6ac':
  Docs: Replacing s.a.c. Android logo to match other sites.
 2014-09-18 18:33:13 +00:00
Clay Murphy
ef3148c1fa Merge "Docs: Replacing s.a.c. Android logo to match other sites." 2014-09-18 18:26:59 +00:00
Clay Murphy
d9e4b52a38 Docs: Replacing s.a.c. Android logo to match other sites. 
Bug: 15408415
Change-Id: I9bdb294f3ff0c5aaf766b4ead79ad9614f9dbd89
 2014-09-18 16:44:21 +00:00
David 'Digit' Turner
dbf03f09de am d0367114: Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev 
* commit 'd036711427ff7ecbf603b51e04c75986504138d9':
  envsetup.sh: Fix handling of emulator prebuilts path.
 2014-09-16 21:34:33 +00:00
David 'Digit' Turner
d036711427 Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev 2014-09-16 19:33:37 +00:00
David 'Digit' Turner
50d5ccc1b2 envsetup.sh: Fix handling of emulator prebuilts path. 
Due to a bad previous merge, everytime 'lunch' is called, a new
instance of prebuilts/android-emulator/<system>/ will be added
to your PATH.

This patch fixes the issue by removing the duplicate code that
should have been removed during the merge. Note that android-emulator
is still being added once to the PATH by code that appears before
in the script.

BUG=17524154

Change-Id: Iaa03159b0c81b15ef4c7c420e2f76e0a48aba789
 2014-09-16 21:23:12 +02:00
Ying Wang
b45c33cd0c 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 17:08:41 +00:00
Ying Wang
fb7978a6d4 am 66ee934c: (-s ours) am 8209d993: Merge "Support to build apk odex for both arch." 
* commit '66ee934c917686cf6ca9caf57c59b038cb212c17':
  Support to build apk odex for both arch.
 2014-09-16 17:08:40 +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
Ying Wang
88cfa03247 Merge "Enable multilib odex only if TARGET_2ND_ARCH is defined." 2014-09-15 19:14:21 +00:00