Commit graph

36 commits

Author SHA1 Message Date
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
Elliott Hughes
36e681b02a resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp
Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
2013-11-07 09:08:00 -08:00
Elliott Hughes
32bfd70333 Remove the hacks needed to support ash and mksh concurrently.
We no longer have ash, and we'd rather not have unnecessary symbolic links
on the system.

Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
2013-11-05 11:13:49 -08:00
Geremy Condra
3e272fd408 am f482fa84: am d7a9f708: Merge "Hmm, contrary to Deckard\'s assurances, this broke internally. Reverting."
* commit 'f482fa848055925d8abe4a8a7f4801bc6c8fc291':
  Hmm, contrary to Deckard's assurances, this broke internally. Reverting.
2013-08-26 14:49:45 -07:00
Geremy Condra
572c5f0667 Hmm, contrary to Deckard's assurances, this broke internally. Reverting.
Change-Id: I0d7892cd619e742fb5d6b1bda6d0dba7d6cd47bf
2013-08-26 21:27:56 +00:00
Geremy Condra
8e3321c585 am 2724d8c4: am d5ec4db7: Merge "Add sepolicy_version to PRODUCT_PACKAGES"
* commit '2724d8c4ac1a8eea593425d682e7244a8e5cc9da':
  Add sepolicy_version to PRODUCT_PACKAGES
2013-08-26 14:20:38 -07:00
William Roberts
711b8d5e13 Add sepolicy_version to PRODUCT_PACKAGES
Change-Id: I3d2652dd594d272507c0a1485e21227149ee4af7
Signed-off-by: William Roberts <wroberts@tresys.com>
2013-08-23 09:18:17 -07:00
Todd Poynor
2b3bd4a88b Add healthd
Change-Id: I055581a12fe88a4e1fb04e675036bf0d345c05c6
2013-07-26 21:32:38 +00:00
Ying Wang
0650d1503d Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH
- BOOTCLASSPATH now is product-configurable;
- No need to maintain the duplicate values in core/dex_preopt.mk.
- clean up some legacy ALL_PREBUILTs.
Bug: 9990214

Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
2013-07-24 15:15:55 -07:00
gcondra@google.com
b839579681 am cc9c2135: am 2e619b7c: Revert "Add the sepolicy.version file to the root directory."
* commit 'cc9c2135bc04489c382985270d6c5a444610b57e':
  Revert "Add the sepolicy.version file to the root directory."
2013-05-20 16:35:32 -07:00
repo sync
2e619b7c54 Revert "Add the sepolicy.version file to the root directory."
This reverts commit 83f646a0ef.
2013-05-17 12:57:52 -07:00
gcondra@google.com
8f8e35d7dd am 809b537e: am 046ed25f: Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
* commit '809b537e4a9fa7007bb455a630f999514f0f0cee':
  Add the sepolicy.version file to the root directory.
2013-05-15 13:37:24 -07:00
repo sync
83f646a0ef Add the sepolicy.version file to the root directory.
Bug: 8841348
Change-Id: I9b4b096eb11b332a4c2c3cb8df179cf611a7ff43
2013-05-13 13:21:23 -07:00
Benoit Goby
dc75794ec2 Add reboot to build
reboot is not a symlink to toolbox anymore and is built separately

Change-Id: I1ded0b46650eeb6365ded86dee1a58d2b0c903e6
2013-03-25 21:26:02 -07:00
Ying Wang
92cd50c416 Remove nonexistent modules from PRODUCT_PACKAGES
and revert back to fatal error if sdk has nonexistent modules.

Change-Id: Ic7185128b0253b3591592b4167ea1e26cee1aa84
2012-10-31 11:55:53 -07:00
Mike Lockwood
daf5e22dba Add new embedded target for a super minimal android build
Remove obsolete BUILD_TINY_ANDROID

Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
2012-10-25 15:28:37 -07:00