p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,886 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

19886 Commits

Author SHA1 Message Date
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 a660afc33d 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 09:31:11 +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 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 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 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
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 d542afcb93 Merge commit 'e866294e' into lmp-mr1-dev-plus-aosp 
Conflicts:
	tools/droiddoc/templates-sac/assets/images/sac_logo.png
 2014-09-18 12:21:48 -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 d76f466f89 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-17 14:11:37 +00:00
Ying Wang 68ce34e872 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 21:06:01 +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 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 04f6577000 am 66ee934c: am 8209d993: Merge "Support to build apk odex for both arch." 
* commit '66ee934c917686cf6ca9caf57c59b038cb212c17':
  Support to build apk odex for both arch.
 2014-09-16 08:49:58 +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
Ying Wang 8209d993da Merge "Support to build apk odex for both arch." 2014-09-15 19:14:15 +00:00
Ying Wang 96c2af033d Enable multilib odex only if TARGET_2ND_ARCH is defined. 
Bug: 17507247
Bug: 14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
 2014-09-15 12:12:36 -07:00
Ying Wang 2e9f639282 Support to build apk odex for both arch. 
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.

Bug: 17409149
Bug: 14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
 2014-09-15 12:12:18 -07:00
Ying Wang 7a8991991f Enable multilib odex only if TARGET_2ND_ARCH is defined. 
Bug: 17507247
Bug: 14694978
Change-Id: I160a37bc0970315054606829aa112b67eaee7d49
 2014-09-15 11:45:52 -07:00
Jeff Arneson ad46e7e7a1 Refactor show_annotations_list to remove HTML tags from method params 
No need to pass in the HTML tags to start and end the list, since
we do the same thing everywhere, and it wasn't very complete anyways.

Change-Id: I504b78b699a03cc5ba7c6f0584173087aab2024b
 2014-09-15 10:02:14 -07:00
Ying Wang 55927b0668 am ce851e88: Merge "Support to build apk odex for both arch." into lmp-dev 
* commit 'ce851e88d9b1a0d934f1a564b3a400782d12e0d3':
  Support to build apk odex for both arch.
 2014-09-14 21:15:57 +00:00
Ying Wang ce851e88d9 Merge "Support to build apk odex for both arch." into lmp-dev 2014-09-14 20:49:14 +00:00
Ying Wang db48da7844 Support to build apk odex for both arch. 
Build odex for both arch in multilib build if an app has
LOCAL_MULTILIB := both.
Refactored the common setup code to a separate file setup_one_odex.mk.

Bug: 17409149
Bug: 14694978
Change-Id: I74c9426cd74fe0b0cb4811368f740a88ac2ae022
 2014-09-13 18:14:15 -07:00
Tyler Gunn 260abc8a10 am 6156bcad: Renaming Telecomm to Telecom. 
* commit '6156bcad42b8a08dcf41b7cb12be90d2c6d02cf5':
  Renaming Telecomm to Telecom.
 2014-09-13 18:03:13 +00:00
Tyler Gunn 6156bcad42 Renaming Telecomm to Telecom. 
- Changing reference from Telecomm to Telecom.

Bug: 17364651
Change-Id: I5b7200396dfc5f0d4c62f9a1aa50bd4fdc04fccf
 2014-09-12 20:06:57 -07:00
Brian Carlstrom 1ac92695c2 am f70dcab1: am c3aeddd3: Merge "Fix mma/mmma by making gettop canonicalize TOP when set" 
* commit 'f70dcab1bf313f02e9a3bea0d1bf75ce28457776':
  Fix mma/mmma by making gettop canonicalize TOP when set
 2014-09-12 22:47:03 +00:00
Brian Carlstrom f70dcab1bf am c3aeddd3: Merge "Fix mma/mmma by making gettop canonicalize TOP when set" 
* commit 'c3aeddd331a62ebe7a4d6d6e5892cbe35222d6e7':
  Fix mma/mmma by making gettop canonicalize TOP when set
 2014-09-12 22:29:00 +00:00
Brian Carlstrom c3aeddd331 Merge "Fix mma/mmma by making gettop canonicalize TOP when set" 2014-09-12 22:18:11 +00:00
Jeff Arneson 3b62f196e1 am faa1dc5c: Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev 
* commit 'faa1dc5c016c18bb7e224bb7f16f41989d1d7c23':
  Show annotation information for fields, enums, etc. and in the class list
 2014-09-12 19:20:17 +00:00
Brian Carlstrom 16b5cd832f am 0c837a09: Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev 
* commit '0c837a093e9c6952885ef370a34b82213f12300c':
  Fix mma/mmma by making gettop canonicalize TOP when set
 2014-09-12 18:53:26 +00:00
Esteban Talavera f69ff0e07f am aaaf5025: Merge "Added new \'adb dpm\' command to the packages list." into lmp-dev 
* commit 'aaaf5025b6ecca2815d32c0c78557686b68baac6':
  Added new 'adb dpm' command to the packages list.
 2014-09-12 18:53:25 +00:00
Jeff Arneson faa1dc5c01 Merge "Show annotation information for fields, enums, etc. and in the class list" into lmp-dev 2014-09-12 18:24:59 +00:00
Brian Carlstrom 0ff3aba580 Fix mma/mmma by making gettop canonicalize TOP when set 
Bug: 17253957

(cherry picked from commit a5c4f178ae)

Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
 2014-09-12 09:37:25 -07:00
Brian Carlstrom 0c837a093e Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev 2014-09-12 16:36:21 +00:00
Esteban Talavera aaaf5025b6 Merge "Added new 'adb dpm' command to the packages list." into lmp-dev 2014-09-12 10:35:48 +00:00
Brian Carlstrom a5c4f178ae Fix mma/mmma by making gettop canonicalize TOP when set 
Bug: 17253957
Change-Id: Ifd6d5984f63981e1f99b6ae6f9459c2801588459
 2014-09-12 00:33:25 -07:00
Ying Wang 6d30b05e0e am 5ae4286b: Merge "Conditionally skip boot jars package name check." into lmp-dev 
* commit '5ae4286b94813171982ff7fdebe88fd29fe7e590':
  Conditionally skip boot jars package name check.
 2014-09-12 05:43:07 +00:00
Raphael Moll fac497340f am 24494187: Merge "SDK Addon multi-sys-img support, part 4." into lmp-dev 
* commit '24494187def3472dca81db6ae782c7d1246c1056':
  SDK Addon multi-sys-img support, part 4.
 2014-09-12 05:43:06 +00:00
Dan Albert 9b0a5cb861 am 66927151: Missed one part of removing the vbox target. 
* commit '6692715135b38ec24f8f22e0219737f7d3fadbc2':
  Missed one part of removing the vbox target.
 2014-09-12 05:43:05 +00:00