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

15377 Commits

Author SHA1 Message Date
Ying Wang 3fd8a4feae am 529a772e: am a90e346c: am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI"" 
* commit '529a772eecc7a2ce1c916286d742f4f3a32e0d98':
  Revert "generic_x86: toggle 64bit binder ABI"
 2014-02-27 17:26:41 +00:00
Ying Wang 529a772eec am a90e346c: am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI"" 
* commit 'a90e346c24d498af57360bd92ff738a1480f0598':
  Revert "generic_x86: toggle 64bit binder ABI"
 2014-02-27 17:24:45 +00:00
Ying Wang a90e346c24 am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI"" 
* commit 'cd07521f464985373fc4fe13812b5f465373bda5':
  Revert "generic_x86: toggle 64bit binder ABI"
 2014-02-27 09:22:03 -08:00
Ying Wang cd07521f46 Merge "Revert "generic_x86: toggle 64bit binder ABI"" 2014-02-27 17:19:34 +00:00
Ying Wang 32d35a71ff Revert "generic_x86: toggle 64bit binder ABI" 
This reverts commit e2525ade32.

Change-Id: Ibaec151084ce4f00194a5a22c4be7531710b4a9f
 2014-02-27 17:19:13 +00:00
Mark Salyzyn 7348edf7e9 am b8424c79: am 4c65c202: am 7fc3a06d: Merge "build: add logd" 
* commit 'b8424c7925a22b4297807cd8fa16bc5097adcc3e':
  build: add logd
 2014-02-27 16:29:59 +00:00
Mark Salyzyn b8424c7925 am 4c65c202: am 7fc3a06d: Merge "build: add logd" 
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
  build: add logd
 2014-02-27 16:26:54 +00:00
Mark Salyzyn 4c65c20235 am 7fc3a06d: Merge "build: add logd" 
* commit '7fc3a06d7fe307332e808712fc8d02c3ed995f80':
  build: add logd
 2014-02-27 08:21:08 -08:00
Mark Salyzyn 7fc3a06d7f Merge "build: add logd" 2014-02-27 16:03:58 +00:00
JP Abgrall 46335a658d am 8c49ad68: am 24bbd72d: (-s ours) am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad" 
* commit '8c49ad68b0e35a85ff71dc8d5b6f195e07fb718a':
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
 2014-02-27 02:25:04 +00:00
JP Abgrall 8c49ad68b0 am 24bbd72d: (-s ours) am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad" 
* commit '24bbd72d694083c0cb51fdf719ba079080f31b62':
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
 2014-02-27 02:21:22 +00:00
JP Abgrall 24bbd72d69 am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad" 
* commit '5d0dd222cef421d5f5bbde0bed3d898e9ca505f1':
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
 2014-02-26 18:19:23 -08:00
JP Abgrall 5d0dd222ce Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad" 2014-02-27 02:17:11 +00:00
Ying Wang f7d12336f5 am b3f2893f: am 66a9b789: Merge "Include privileged apps with app zip file." 
* commit 'b3f2893f793085225f506d771d36c9d710bd0306':
  Include privileged apps with app zip file.
 2014-02-27 01:31:48 +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
Nick Kralevich 1884833c3a build: add logd 
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>

* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog

Signed-off-by: Mark Salyzyn <salyzyn@google.com>

Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
 2014-02-26 15:39:38 -08:00
Ying Wang 3156d4c425 am 45bde7bf: am 9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist." 
* commit '45bde7bfad783e096075471b9a5d52b46dbaa27f':
  Remove external/tcpdump from 64-bit build blacklist.
 2014-02-26 22:34:56 +00:00
Nick Kralevich e9513f95c9 am 65f26a76: am 9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy." 
* commit '65f26a769ac3d3648c533e5e39ba6d1f3f1b3600':
  Add policy for MIPS emulator, fix x86 policy.
 2014-02-26 22:34:55 +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
Nick Kralevich 65f26a769a am 9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy." 
* commit '9edc9783d21f59bc532e2b7b62ae2464ee976438':
  Add policy for MIPS emulator, fix x86 policy.
 2014-02-26 22:31:01 +00:00
Ying Wang 9aa715a579 Merge "Remove external/tcpdump from 64-bit build blacklist." 2014-02-26 22:23:46 +00:00
Ying Wang 5c68e265ac Remove external/tcpdump from 64-bit build blacklist. 
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
 2014-02-26 14:18:21 -08:00
Nick Kralevich 9edc9783d2 Merge "Add policy for MIPS emulator, fix x86 policy." 2014-02-26 21:37:29 +00:00
Ying Wang 332bbced6d am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules." 
* commit 'a8d273d3ce1d062c55dd936ab17792c7494643ca':
  Conditionally include the 'samplecode' rules.
 2014-02-26 20:11:56 +00: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 bbe5f88e1d Merge "Conditionally include the 'samplecode' rules." 2014-02-26 19:58:59 +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
Stephen Smalley 1c0e1cde7b Add policy for MIPS emulator, fix x86 policy. 
The qemud and /dev/qemu_pipe policy bits copied to generic
and generic_x86 by I620d4aef84a5d4565abb1695db54ce1653612bce
are required for generic_mips as well.  In testing, we
further saw other denials for generic_mips that correspond
exactly to what is already allowed in the generic sepolicy, so
just inherit the sepolicy files from generic for now.
We could do likewise for the generic_x86 sepolicy for the files that are
identical with generic if desired, but that is not done by this change.

The generic_x86 sepolicy was missing a rule for /sys/qemu_trace
moved to the generic sepolicy by the prior change, so fix that omission.

The generic*64 variants will need something similar, either by inheriting
from one of the existing sepolicy directories as in the MIPS
case or by forking their own copies as in the x86 case.

Change-Id: Iec7c8825734a3f96f7db8ae1d10dce1f30b22bdf
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-02-26 09:12:55 -05:00
Torne (Richard Coles) 64cd12187e am e665992c: am 63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS." 
* commit 'e665992cb8b66bda2797ef8fa3a69c633864ca44':
  Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
 2014-02-26 11:12:09 +00: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 948c22b4d4 am 2aeff455: am 66331624: Merge "Fix prebuilt library dependency for multilib build" 
* commit '2aeff4558783b70381efc7bf7bf93cce76f57122':
  Fix prebuilt library dependency for multilib build
 2014-02-26 02:40:09 +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 66331624b5 Merge "Fix prebuilt library dependency for multilib build" 2014-02-26 02:33:30 +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 1615a1013e am 4a122c96: am 9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64." 
* commit '4a122c96f3abf0eb20c5b2c3db7cd067f5a919fb':
  oprofile/daemon doesn't build for x86_64.
 2014-02-26 02:12:52 +00: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 08842ae767 am 12c909b2: resolved conflicts for merge of 9057f619 to klp-modular-dev-plus-aosp 
* commit '12c909b20c2a1f8be74914186e54c4143ddc263e':
  Remove external/wpa_supplicant_8 and external/android-clat
 2014-02-26 01:40:44 +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
Elliott Hughes 0cfae9fdb5 oprofile/daemon doesn't build for x86_64. 
We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.

Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356
 2014-02-25 17:32:22 -08:00
Ying Wang 9057f619c3 Merge "Remove external/wpa_supplicant_8 and external/android-clat" 2014-02-26 01:21:12 +00:00
Ying Wang a52f117073 Remove external/wpa_supplicant_8 and external/android-clat 
from 64_bit_blacklist.mk.
They now build fine for 64-bit.

Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
 2014-02-25 17:15:47 -08:00
Elliott Hughes 9f3e1d788e am 331272f9: am 25b55485: Merge "Take libcore off the LP64 blacklist." 
* commit '331272f94bc85c5eb9853e726c024375f691ab59':
  Take libcore off the LP64 blacklist.
 2014-02-26 00:26:37 +00:00
Elliott Hughes 331272f94b am 25b55485: Merge "Take libcore off the LP64 blacklist." 
* commit '25b5548522220940f50ab5b4dfb3e2e691ad913b':
  Take libcore off the LP64 blacklist.
 2014-02-26 00:22:49 +00:00
Ying Wang 31dab4c45f am 4a0b06e8: am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir" 
* commit '4a0b06e80871aad1bc8a8493bdd74b9ff30a9a2f':
  Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
 2014-02-26 00:21:06 +00:00
Ying Wang 4a0b06e808 am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir" 
* commit 'f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
  Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
 2014-02-26 00:18:21 +00:00