Commit graph

65 commits

Author SHA1 Message Date
Christopher Ferris
07b0a0da9f Merge "Add libc_malloc_debug to the always build list." am: 4d15f2f8c9
am: 093ca195bd

* commit '093ca195bd6a3e21c11ad04553b3fe5c6447ea97':
  Add libc_malloc_debug to the always build list.
2016-01-25 21:33:46 +00:00
Christopher Ferris
4d15f2f8c9 Merge "Add libc_malloc_debug to the always build list." 2016-01-25 21:27:57 +00:00
Alex Klyubin
24b1c64c5b resolve merge conflicts of bb3d77ba95 to master.
Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a
2016-01-22 11:05:03 -08:00
James Hawkins
bc5dc64232 bootstat: Add bootstat to the embedded target to support logging boot
time across devices.

Bug: 21724738
Change-Id: I165e8597103ea235a0826e321a1658823c4b4664
2016-01-21 15:39:45 -08:00
Christopher Ferris
ccaeb65d8e Add libc_malloc_debug to the always build list.
Change-Id: I26e553478b5ef4017aea1e06530931d4b18e308b
2015-12-17 15:15:32 -08:00
Dimitry Ivanov
4a1db8a2a1 Merge "Include libGLESv3.so to PRODUCT_PACKAGES" am: 73661d4220 am: 973decf35c
am: fb70c580b1

* commit 'fb70c580b1497a31ff345b36f032241fa55415b2':
  Include libGLESv3.so to PRODUCT_PACKAGES
2015-12-08 03:04:34 +00:00
Dmitriy Ivanov
bb16dcf28e Include libGLESv3.so to PRODUCT_PACKAGES
Bug: http://b/25754041
Change-Id: If5f5030e7e1da037d873f0252dd8beb8ce6fd4db
2015-11-18 15:30:57 -08:00
Dianne Hackborn
30c197eeaf Include the new "cmd" command-line tool in all Android builds.
Change-Id: I93f415ddde0f4e273be04af3379ee706962416d2
2015-10-12 10:39:04 -07:00
Tom Cherry
844079e0f2 resolved conflicts for merge of b8b53534 to mnc-dr-dev-plus-aosp
Change-Id: I72caaa4aaf9ec78abb83e9d9b3ced535ab3f7c04
2015-09-03 15:20:51 -07:00
Tom Cherry
05bd7f3499 move init.trace.rc to frameworks/native
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.

Bug 23186545

Change-Id: Ibb86761d3e8d3c6d194ddb1220f93a71a8c6675b
2015-09-03 14:20:43 -07:00
Badhri Jagan Sridharan
74415b3b6d am 28dd99d8: am a0eb142a: am dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
* commit '28dd99d8eacb5b1baf4f16a07472de8bbd9d5100':
  Include init.usb.configfs.rc into rootdir
2015-09-03 04:23:00 +00:00
Badhri Jagan Sridharan
a8a4a93733 Include init.usb.configfs.rc into rootdir
Bug=23633457

Change-Id: I26bbc5ff597138b2ccac1de72117753739b31554
2015-09-01 22:43:42 +00:00
Stephen Smalley
d3a803e668 build: switch over to file_contexts.bin only
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.

Depends on
   I75a781100082c23536f70ce3603f7de42408b5ba
   I43806d564b83d57f05f5c36c8eba7b1ff4831b04
   Id560d093440a2aba99cef28c20133b35feebf950
   I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400

Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-08-04 14:59:06 -04:00
Richard Haines
a65637d230 Update embedded.mk to support file_contexts.bin
This change supports external/libselinux changes to implement
a PCRE formatted binary file_contexts file.

Change-Id: I75a781100082c23536f70ce3603f7de42408b5ba
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
2015-08-04 14:53:12 -04:00
Neil Fuller
abf5ef8fdd Merge "Add tzdatacheck to image" 2015-05-15 09:09:46 +00:00
Neil Fuller
84b983a7ef Add tzdatacheck to image
Bug: 21110439
Bug: 19941636
(cherry picked from commit 7d18a68417)

Change-Id: I29ab303d2695ba1cadf70c2d2f4440d34a8cede9
2015-05-14 12:02:58 +01:00
Neil Fuller
7d18a68417 Add tzdatacheck to image
Bug: 21110439
Bug: 19941636
Change-Id: I743236d9c7b433968865648ffae25451c6012a5f
2015-05-14 10:15:35 +01:00
Dan Albert
c6355b9464 Remove stlport from global package list.
This is now whitelisted per device.

Bug: http://b/15193147
Change-Id: I7fcd0891242fb552a17753b151cf431a398bbc44
(cherry picked from commit 0a93b56924)
2015-05-08 09:56:56 -07:00
Dan Albert
0a93b56924 Remove stlport from global package list.
This is now whitelisted per device.

Bug: http://b/15193147
Change-Id: I7fcd0891242fb552a17753b151cf431a398bbc44
2015-05-06 13:21:51 -07:00
Ying Wang
9668a7ab1d Add host tool fastboot to every build.
Some tools expect fastboot to be present even in user builds.

Change-Id: I4b6ee458eb2feb0dc7a77ec33a04219c5f4adc0d
2015-04-13 14:49:19 -07:00
Ying Wang
f25838a7ea Support modules to be installed directly to recovery.img
Previously the recovery binary was configured to be installed to the
system.img and then got copied to recovery.img in the recovery.img's
build rule.
With this change, a module, such as the recovery binary, can configure
itself to be installed directly to the recovery.img, just like how other
modules get installed to system.img.

Bug: 19667686
Change-Id: I46b0b4a95cf078a68999db9c0f6635d6a3f5cd86
2015-03-11 10:38:13 -07:00
Elliott Hughes
c00dedb21c Make sure we keep building grep now it's broken out from toolbox.
Change-Id: Ib71e37c5ba238136a9790cd92ecec745e099341e
2015-02-04 18:56:17 -08:00
Dan Albert
01bf7931eb Revert "Remove libstlport from PRODUCT_PACKAGES."
The platform dependence on stlport is now far enough gone that a
regular build no longer builds stlport (woot!). Unfortunately, vendor
blobs don't claim their dependencies, so the build system has to keep
track of this for them.

Bug: 18777920
This reverts commit ef11722e9b.

Change-Id: I6a0dd26dfc6837c419eb5dd2ec5258dd323fd4bf
2014-12-16 16:13:06 -08:00
Elliott Hughes
626d3f0a77 Ensure the base system includes toybox.
Change-Id: I0eec19328855d67da1c574a88b452f0eeec6adc7
2014-11-22 23:13:40 -08:00
Dan Albert
ef11722e9b Remove libstlport from PRODUCT_PACKAGES.
Bug: 15193147
Change-Id: Idd2699d895393216bcd514da64145540faec4033
2014-11-17 14:26:11 -08:00
Elliott Hughes
0c2dcc0845 am cc3b0c41: am 5c11a76b: Merge "Add debug.atrace.tags.enableflags=0 to /default.prop."
* commit 'cc3b0c411389a7f8dbcc9317614f9027585cc3d0':
  Add debug.atrace.tags.enableflags=0 to /default.prop.
2014-09-04 00:17:05 +00:00
Stephen Smalley
88c5a130b4 Add debug.atrace.tags.enableflags=0 to /default.prop.
This ensures that the property is always set by init
prior to starting any other process, which avoids the need
for the bionic systrace code to try to set the property
if it has not already been set to avoid the full cost of
searching for an undefined property each time.  See
change I30ed5b377c91ca4c36568a0e647ddf95d4e4a61a for
the relevant bionic code.

The problem with the current bionic code is that it can
trigger an attempt to set this property from any random
process, which will be denied unless the process is already
authorized to set debug properties.  This is visible in the
form of various SELinux avc: denied messages and
init sys_prop:  permission denied messages in dmesg output.
Allowing all domains to set such properties is undesirable.

Change-Id: I6d953c0c281fd72ad3eba8a479fd258023579b5b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-03 15:08:08 -04:00
Ying Wang
06940df713 resolved conflicts for merge of ef44fb2d to lmp-dev-plus-aosp
Change-Id: I5551e6b1303f2b37d199a1b894f37c50839fdecc
2014-07-17 14:51:13 -07:00
Ying Wang
b2be5ffded Remove linker64 and debuggerd64
We don't have separate *64 module names any more.
Now both 32-bit and 64-bit variants are built under the same module name.

Change-Id: I1956a6a88ec6fe280798be01928239d098dfe27a
2014-07-17 14:01:12 -07:00
Nick Kralevich
64dd84a94f am 003f84fb: am c80e876c: Merge "Add service_contexts to embedded.mk."
* commit '003f84fbbbffa0eb0b6958a2f7f4a120206decc8':
  Add service_contexts to embedded.mk.
2014-06-12 21:10:20 +00:00
Riley Spahn
8b834ecedb Add service_contexts to embedded.mk.
Add service_contexts to embedded.mk to support MAC checks in the
service manager.

Bug: 12909011
Change-Id: I31f4f4e1acb2be8167f2f11f93c936c18303135a
2014-06-12 20:45:58 +00:00
Nick Kralevich
362d2d4123 am 333005f1: am c706ea79: Merge "Include selinux_version file with builds."
* commit '333005f1bfa7dc36d327ddb45fdf8fa2d38ca768':
  Include selinux_version file with builds.
2014-06-02 19:27:04 +00:00
Nick Kralevich
c706ea7962 Merge "Include selinux_version file with builds." 2014-06-02 19:23:12 +00:00
Dave Allison
faa2d24991 am f4115cdf: am 2a2ba735: Merge "Add libsigchain to the embedded.mk makefile"
* commit 'f4115cdfac6bfde8e3d7cab1e7782d078d764209':
  Add libsigchain to the embedded.mk makefile
2014-05-29 21:06:26 +00:00
Dave Allison
2a2ba735df Merge "Add libsigchain to the embedded.mk makefile" 2014-05-29 19:51:50 +00:00
Mark Salyzyn
1309152ec1 am 1fe58202: am ea65c191: Merge "libctest: zap"
* commit '1fe582026940c70f4a7ff8f130372234d07d3611':
  libctest: zap
2014-05-21 21:16:28 +00:00
Mark Salyzyn
ae0d241144 libctest: zap
Change-Id: Ia3ff0cad0995af428adf2dbdf10587dae904ec7d
2014-05-21 13:27:58 -07:00
Dave Allison
330584ee81 Add libsigchain to the embedded.mk makefile
This library is used in a LD_PRELOAD environment variable and the linker shows
a warning if it is not present.  This change is to added it to all targets so
that the warning is not shown.  If ART is not provided on the device this
library has no effect.

Change-Id: I81f01b66fa9c78048534f4bcfc04d62b18057a03
2014-05-16 13:51:36 -07:00
Robert Craig
65dad28716 Include selinux_version file with builds.
The selinux_version file is used to perform policy
versioning checks by libselinux and SELinuxMMAC. When
loading policy a check is first performed to determine
if the policy out in /data/security/current should be
used to override the base policy shipped with the device.
The selinux_version file is used to make that choice. The
contents of the file simply contains the BUILD_ID that
the policy was built against. A simple string comparison
is then performed by libselinux and SELinuxMMAC.

Change-Id: I69d9d071743cfd46bb247c98f94a193396f8ebbd
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-04-28 22:05:54 +00:00
Ying Wang
25e75abac2 am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65':
  Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:36:05 +00:00
Ying Wang
e948255ac6 Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Bug: 11368415
Bug: 14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
2014-04-15 14:42:27 -07:00
Ying Wang
46d69e9914 am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"
* commit '9ce34617a001338093b0de85443925a37a967f0d':
  Fix embedded build
2014-03-20 19:36:32 +00:00
Ying Wang
8c7e74ee05 Fix embedded build
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.

Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
2014-03-20 12:13:10 -07:00
Colin Cross
a0eb50acca resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp
Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
2014-02-13 16:32:48 -08:00
Colin Cross
381435353d add linker64 and debuggerd64 to all products
Add linker64 and debuggerd64 to embedded.mk.  They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.

Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
2014-02-13 16:23:33 -08:00
Nick Vaccaro
ec0c99a6c5 Add atrace for supporting systrace tool
Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
2014-01-30 20:33:46 +00:00
Elliott Hughes
69c36ee7a8 am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '4fbf23ef8267849ce88217a256b394de3904a4f6':
  Remove libthread_db from the default include path.
2014-01-28 00:54:33 +00:00
Elliott Hughes
2f8dcdd961 Remove libthread_db from the default include path.
This should never have been on the default include path.

The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.

Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
2014-01-27 15:45:17 -08:00
Todd Poynor
a246685741 build lmkd
Change-Id: I5e7c785d3f76ec2d0f30ae6aa948436f5d04957b
2014-01-06 21:05:08 +00:00
The Android Open Source Project
b9041a45b1 Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
2013-11-22 11:06:11 -08:00