Commit graph

6611 commits

Author SHA1 Message Date
Tao Bao
bbb41a7097 am bcd7ae6f: Merge "build: Fix "adb shell" in recovery for system_root_image."
* commit 'bcd7ae6f30149a2296d7288c74ffe6c90188f93d':
  build: Fix "adb shell" in recovery for system_root_image.
2015-07-31 16:49:30 +00:00
Tao Bao
be46a54589 build: Fix "adb shell" in recovery for system_root_image.
For system images that contain the root directory, "adb shell" in
recovery stops working if the image is mounted at "/system", because
sh now locates at /system/system/bin/sh. We fix the issue by mounting
the image on /system_root and create a symlink to /system_root/system
for /system.

Bug: 22855115
Change-Id: Ia6b257b75aeb67687c3909063d1725a23a5ccd60
2015-07-30 16:44:17 -07:00
Dan Albert
35a8ae7b73 am 8427c587: Merge "Make TSAN easier to use."
* commit '8427c5878c56c96b9384a89cb6dc00e30cd5bbfa':
  Make TSAN easier to use.
2015-07-30 18:55:24 +00:00
Dan Albert
8427c5878c Merge "Make TSAN easier to use." 2015-07-30 18:44:19 +00:00
Elliott Hughes
1341e88c57 am 524a7e46: Merge "Remove HAVE_WINSOCK."
* commit '524a7e46937c59cfb34289819fd3ac117911cd8d':
  Remove HAVE_WINSOCK.
2015-07-30 17:31:47 +00:00
Elliott Hughes
524a7e4693 Merge "Remove HAVE_WINSOCK." 2015-07-30 17:24:06 +00:00
Dan Albert
a6311b7212 Make TSAN easier to use.
TSAN is not supported on 32-bit architectures. For non-multilib cases,
make its use an error. For multilib cases, don't use it for the 32-bit
case.

Change-Id: I8e40be4002379cc2c9aa98ab8b812b337d6e077e
2015-07-30 10:17:33 -07:00
Elliott Hughes
49f80c6f37 am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h."
* commit '51e2e5893d5bcf62d12e041a60ed99f2a03758be':
  Remove the now-empty darwin AndroidConfig.h.
2015-07-30 16:25:10 +00:00
Elliott Hughes
7f80a9ed44 Remove the now-empty darwin AndroidConfig.h.
Change-Id: Icdbb06514c099653923aae936c31abfbaeaccf7a
2015-07-30 09:16:01 -07:00
Elliott Hughes
4887ee3bdd am cf427fb4: Merge "Don\'t define S_IRGRP in AndroidConfig.h."
* commit 'cf427fb4ae19449d0c0ecbc86b88f37b5fcb0f05':
  Don't define S_IRGRP in AndroidConfig.h.
2015-07-30 03:58:47 +00:00
Elliott Hughes
cf427fb4ae Merge "Don't define S_IRGRP in AndroidConfig.h." 2015-07-30 03:43:38 +00:00
Elliott Hughes
24ed450ad9 am f07ddab1: Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
* commit 'f07ddab187df78a7be32289506f5eca051339f75':
  Remove global Windows __BEGIN_DECLS/__END_DECLS.
2015-07-30 03:32:29 +00:00
Elliott Hughes
f07ddab187 Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS." 2015-07-30 03:20:36 +00:00
Elliott Hughes
61c94258b1 Remove global Windows __BEGIN_DECLS/__END_DECLS.
Change-Id: Ic1ba634a0376c9c1b484098b4ca41cf7659f06b1
2015-07-29 20:14:59 -07:00
Elliott Hughes
47b557a9ca Don't define S_IRGRP in AndroidConfig.h.
Nothing seems to be relying on this anyway.

Change-Id: I24e2509e4d24bc445961430bb74f8ca04135bc37
2015-07-29 19:26:39 -07:00
Elliott Hughes
1de24c7f64 Remove HAVE_WINSOCK.
Change-Id: I362451b68775de0216c5b8736f5cc16a7933b6c2
2015-07-29 19:05:24 -07:00
Ying Wang
bb369efdf8 am 1a5a615a: Merge "Update mac_sdk_versions_supported."
* commit '1a5a615a7b167e4232f3185eef72a7e5b44aef34':
  Update mac_sdk_versions_supported.
2015-07-30 00:51:24 +00:00
Ying Wang
1a5a615a7b Merge "Update mac_sdk_versions_supported." 2015-07-30 00:37:38 +00:00
Ying Wang
d1123ff4c5 Update mac_sdk_versions_supported.
Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))

Bug: 22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538
2015-07-29 17:36:38 -07:00
Elliott Hughes
54307a2609 am 1dbb4166: Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."
* commit '1dbb41661afdffb41ae346c44075507f1840bc66':
  Remove OS_PATH_SEPARATOR from AndroidConfig.h.
2015-07-29 23:25:01 +00:00
Elliott Hughes
45e2a12bd7 Remove OS_PATH_SEPARATOR from AndroidConfig.h.
Change-Id: I4143be14e5117526bfa98d83e246cc4360209c13
2015-07-29 15:31:39 -07:00
Ying Wang
ac6e6b347b am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
* commit '0c0b2e659fe52dc1901677b74dc390c52b1b5e3b':
  Use unmodified MAKECMDGOALS in ninja.mk.
2015-07-29 22:11:39 +00:00
Ying Wang
0c0b2e659f Merge "Use unmodified MAKECMDGOALS in ninja.mk." 2015-07-29 21:59:42 +00:00
Simon Wilson
83da600792 am 37700c9a: Merge "Add compressor options for squashfs system images"
* commit '37700c9ad19c8d9f8578604ca502cb6d55c22d99':
  Add compressor options for squashfs system images
2015-07-29 21:53:37 +00:00
Simon Wilson
37700c9ad1 Merge "Add compressor options for squashfs system images" 2015-07-29 21:35:57 +00:00
Ying Wang
bb1da5e614 Use unmodified MAKECMDGOALS in ninja.mk.
The build system removes targets like "PRODUCT-full-eng" from
MAKECMDGOALS in build/core/product_config.mk.
Without this change, such target isn't passed to kati.

Change-Id: I0b3949ed1f5557445d7f5d5bd59b7875c0b2ea7f
2015-07-29 12:21:54 -07:00
Ying Wang
43275b9af5 am d864f439: Merge "Remove from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set."
* commit 'd864f43932cb0da10837efb0da270af4cbfc0f91':
  Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
2015-07-29 17:21:15 +00:00
Ying Wang
d864f43932 Merge "Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set." 2015-07-29 16:59:50 +00:00
Elliott Hughes
8a5a0356e8 am d3fd73f1: Merge "Remove HAVE_WINDOWS_PATHS."
* commit 'd3fd73f157524fcc369a3c99de580d3598640ed8':
  Remove HAVE_WINDOWS_PATHS.
2015-07-29 16:13:01 +00:00
Elliott Hughes
b15b512825 Remove HAVE_WINDOWS_PATHS.
Change-Id: I11284ceddf08eb284af56360f0cf80f4725c98e9
2015-07-29 08:45:40 -07:00
Tao Bao
910d382269 am bcc4d671: Merge "Support systems that use a full copy of recovery image."
* commit 'bcc4d671745beaa5314a0a1133adc0347b55db77':
  Support systems that use a full copy of recovery image.
2015-07-28 23:42:52 +00:00
Tao Bao
f2cffbddb9 Support systems that use a full copy of recovery image.
If BOARD_USES_FULL_RECOVERY_IMAGE == true, a full copy of recovery
image will be carried as /system/etc/recovery.img instead of a patch
at /system/recovery_from_boot.p.

Bug: 22641135
Change-Id: Ie271d3e2d55d7b003f667ac5b44203d69b23c63b
(cherry picked from commit 8beab69bd5)
2015-07-28 12:20:36 -07:00
Fredrik Roubert
8a3dd242ac Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
Currently, DEX2OATD_DEPENDENCY is created by appending $(DEX2OATD) to
the value of DEX2OAT_DEPENDENCY and then if USE_DEX2OAT_DEBUG is set,
DEX2OAT_DEPENDENCY is set to DEX2OATD_DEPENDENCY, adding a dependency
on $(DEX2OAT) even in configurations where this will not be built.

This change removes DEX2OATD and DEX2OATD_DEPENDENCY entirely to instead
assign dex2oat or dex2oatd to DEX2OAT depending on USE_DEX2OAT_DEBUG,
making it possible to build with these flags set:

USE_DEX2OAT_DEBUG=true
ART_BUILD_HOST_NDEBUG=false
ART_BUILD_HOST_DEBUG=true
ART_BUILD_TARGET_NDEBUG=false
ART_BUILD_TARGET_DEBUG=true
make build-art-host

Change-Id: I4fa75d1b7e9751c73c43ec943fd8446cc231a070
2015-07-28 11:54:08 -07:00
Dan Albert
29dc917b16 am d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."
* commit 'd4ff228319d8382a062c9843511d760d1933a9f4':
  Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.
2015-07-28 00:13:58 +00:00
Dan Albert
d4ff228319 Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION." 2015-07-28 00:04:36 +00:00
Dan Albert
ef3e7cfa5d Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.
Change-Id: I2cd97b453ad24cc4e5d59b4035e861df41b8cbb9
2015-07-27 14:14:56 -07:00
Ying Wang
3d2c90d186 am cb031414: Merge "Fix mmma uses like "mmma ./external/apache-harmony""
* commit 'cb0314145956c4f918c961e2ecbdfb97a080ac61':
  Fix mmma uses like "mmma ./external/apache-harmony"
2015-07-24 19:54:00 +00:00
Ying Wang
cb03141459 Merge "Fix mmma uses like "mmma ./external/apache-harmony"" 2015-07-24 19:35:47 +00:00
Ying Wang
a5184806be Fix mmma uses like "mmma ./external/apache-harmony"
Fix mmma uses like "mmma ./external/apache-harmony" by removing the
leading ./ in entries in BUILD_MODULES_IN_PATHS.

Change-Id: I414e734c8a29434fc89ddb2b745613c33709c5e3
2015-07-24 12:30:41 -07:00
Colin Cross
4f4c7c2228 am f8f448b3: Merge "Build with kati+ninja when USE_NINJA=true"
* commit 'f8f448b3cac0bebdd8012fec5087af7805885f2d':
  Build with kati+ninja when USE_NINJA=true
2015-07-24 18:55:36 +00:00
Colin Cross
f8f448b3ca Merge "Build with kati+ninja when USE_NINJA=true" 2015-07-24 18:43:58 +00:00
Brian Carlstrom
517daeb633 am 73a2a902: Merge "Remove unneeded aapt dependency"
* commit '73a2a9028f6feae81a2734e0dd4bdc4e13f66efd':
  Remove unneeded aapt dependency
2015-07-24 04:24:46 +00:00
Colin Cross
3b324cb32e Build with kati+ninja when USE_NINJA=true
If USE_NINJA=true, use kati to translate makefiles into ninja files,
and then execute them with ninja.

Builds kati from source using simplified versions of the rules
in binary.mk and definitions.mk.

Adds two new goals when USE_NINJA=true: generateonly will regenerate
build.ninja but not rebuild (useful for comparing build.ninja output
between runs), and fastincremental will skip regenerating build.ninja
and go directly to running ninja, providing ~5 second incremental
builds.

Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-23 17:29:01 -07:00
Brian Carlstrom
1a71f951a7 Remove unneeded aapt dependency
Change-Id: Ie9b550367f7c6b91d46dc2506c420a45b0d39703
2015-07-23 17:12:10 -07:00
Ying Wang
8b4d143239 am cd7dfdb4: Merge "Cleanups."
* commit 'cd7dfdb4bf3f7d431d2a37908c550a83a282bf22':
  Cleanups.
2015-07-21 23:57:42 +00:00
Ying Wang
c677675ccc am 83568a6d: Merge "Create OUT_DIR before writing build_number.txt."
* commit '83568a6d884f695854d5f7ffe79e465db061dcaa':
  Create OUT_DIR before writing build_number.txt.
2015-07-21 23:57:41 +00:00
Ying Wang
cd7dfdb4bf Merge "Cleanups." 2015-07-21 23:45:42 +00:00
Ying Wang
06332732a4 Create OUT_DIR before writing build_number.txt.
Change-Id: I6a84ec59194c48f4291480cb0c94db0da488518c
2015-07-21 16:39:46 -07:00
Ying Wang
bbd4755647 Cleanups.
- Deleted unused functions in definitions.mk.
- lint is never fully functional in the platform source tree.
- Retire LOCAL_DIST_BUNDLED_BINARIES: now the build system/framework
  supports JNI embedded in apk.

Change-Id: I6314cb20d1544c704ccbc4c1f9cccb9c54fb5a51
2015-07-21 16:03:19 -07:00
Ying Wang
b22469a8c5 am 65259743: Merge "Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]"
* commit '65259743e45886a2941771716b92db91de35ea8c':
  Split [CC|CXX]_WRAPPER from [TARGET|HOST]_[CC|CXX]
2015-07-21 21:22:53 +00:00