openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
24,527 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

24527 Commits

Author SHA1 Message Date
Tao Bao 4ac8e059bf Merge "Read fstab from the source build." 2015-07-29 21:21:14 +00:00
Tao Bao dd24da9ec9 Read fstab from the source build. 
When creating incremental OTAs, we should always use the fstab from the
source build instead of the target.

Bug: 21948974
Change-Id: Iff44130f88a679b253ea1adcfac4ed8566ce9cc7
 2015-07-29 14:11:55 -07:00
Miao Wang fbfa983a59 am 88618b8e: am 73f967b7: am b7a3bc56: am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev 
* commit '88618b8ee98f6861cc4533a8c8e1b52c4017d52b':
  [RenderScript] Only upgrade RS target API for compat build.
 2015-07-29 20:09:50 +00:00
Miao Wang 88618b8ee9 am 73f967b7: am b7a3bc56: am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev 
* commit '73f967b717bdccbcaf22a4d387e3241f89b49229':
  [RenderScript] Only upgrade RS target API for compat build.
 2015-07-29 19:59:47 +00:00
Miao Wang 73f967b717 am b7a3bc56: am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev 
* commit 'b7a3bc569cf8bc928391440db5113dc8f1f12399':
  [RenderScript] Only upgrade RS target API for compat build.
 2015-07-29 19:48:15 +00:00
Ian Pedowitz d1597242c8 am 2770497a: am 3a6d1290: am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev 
* commit '2770497a394c244c19d085decc42aa1979b36143':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 3
 2015-07-29 19:47:48 +00:00
Ian Pedowitz 2770497a39 am 3a6d1290: am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev 
* commit '3a6d12908769821dde224c2ee23ab129cac88182':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 3
 2015-07-29 19:37:28 +00:00
Miao Wang b7a3bc569c am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev 
* commit 'fbf80e9d6294c9ab1989572faab888e4f8641b1c':
  [RenderScript] Only upgrade RS target API for compat build.
 2015-07-29 19:23:45 +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
Ian Pedowitz 3a6d129087 am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev 
* commit '9e8d2278613976863fb63c4e5c9d70046f2e4317':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 3
 2015-07-29 19:13:17 +00:00
Miao Wang c2dd225a9f am 473a832d: am 489d3ea7: am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets. 
* commit '473a832dc4f32239663b3b370fc5847e86f4a208':
  [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
 2015-07-29 19:13:16 +00:00
Miao Wang fbf80e9d62 Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev 2015-07-29 19:07:48 +00:00
Ian Pedowitz 9e8d227861 am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev 
* commit '96585b06dfb29023adc7097423c9ef266d13ac30':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 3
 2015-07-29 19:00:02 +00:00
Miao Wang 473a832dc4 am 489d3ea7: am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets. 
* commit '489d3ea76a4910994b0f2d06dfed43e7b69ca581':
  [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
 2015-07-29 18:50:23 +00:00
Ian Pedowitz 96585b06df Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev 2015-07-29 18:48:26 +00:00
Miao Wang a11f6c2f0e [RenderScript] Only upgrade RS target API for compat build. 
- Fix build

Bug: 22796994
Bug: 22693954
Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71
 2015-07-29 11:46:23 -07:00
Miao Wang 489d3ea76a am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets. 
* commit '1a30e0364184fc0beac68faaf798715a46793420':
  [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
 2015-07-29 18:27:38 +00:00
Miao Wang 1a30e03641 am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets. 
* commit '302e944c6034060eb7ff51ea2a3abe740cf2c9b7':
  [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
 2015-07-29 18:05:06 +00:00
Ying Wang df5cd19a05 am 0ecf3126: am 43275b9a: am d864f439: Merge "Remove from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set." 
* commit '0ecf31262ea9eb91a12b67c2386bf5fda9865d6c':
  Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
 2015-07-29 18:04:07 +00:00
Ying Wang 0ecf31262e am 43275b9a: am d864f439: Merge "Remove from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set." 
* commit '43275b9af5bfe338464a6839b9fd33285b22704c':
  Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
 2015-07-29 17:41:18 +00:00
Ian Pedowitz db042bdccd Bump PLATFORM_PREVIEW_SDK_VERSION to 3 
Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
 2015-07-29 10:37:24 -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 e00bc160c7 am 86b9fcb9: am 8a5a0356: am d3fd73f1: Merge "Remove HAVE_WINDOWS_PATHS." 
* commit '86b9fcb9a42bb67ad60ec5b6e85dafa65637898c':
  Remove HAVE_WINDOWS_PATHS.
 2015-07-29 16:49:55 +00:00
Elliott Hughes 86b9fcb9a4 am 8a5a0356: am d3fd73f1: Merge "Remove HAVE_WINDOWS_PATHS." 
* commit '8a5a0356e8340ae7dce38d1bc346eb7675cf3f41':
  Remove HAVE_WINDOWS_PATHS.
 2015-07-29 16:25:52 +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 d3fd73f157 Merge "Remove HAVE_WINDOWS_PATHS." 2015-07-29 15:48:41 +00:00
Elliott Hughes b15b512825 Remove HAVE_WINDOWS_PATHS. 
Change-Id: I11284ceddf08eb284af56360f0cf80f4725c98e9
 2015-07-29 08:45:40 -07:00
Miao Wang 302e944c60 [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets. 
Bug: 22796994
Bug: 22693954

This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target
devices. It also fixes an issue where the target RenderScript API is
below 21 for 64-bit compilation. In those cases, we should always
upconvert it to 21 (since that is the first available 64-bit release).

Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
 2015-07-28 19:30:20 -07:00
Tao Bao 281f576029 am 7eddd628: resolved conflicts for merge of 910d3822 to mnc-dr-dev-plus-aosp 
* commit '7eddd6285f06d49c6ac30015de64ff8468193743':
  Support systems that use a full copy of recovery image.
 2015-07-29 00:17:01 +00:00
Tao Bao 7eddd6285f resolved conflicts for merge of 910d3822 to mnc-dr-dev-plus-aosp 
Change-Id: I2c899be9d6a82664e4d14c903311daeed5e546fd
 2015-07-28 16:58:03 -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 bcc4d67174 Merge "Support systems that use a full copy of recovery image." 2015-07-28 23:28:40 +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
Elliott Hughes 2ef549f7f5 am 36af8c3c: am f79ba085: am 7ecb919d: Merge "Remove unused "host/Directories.h"." 
* commit '36af8c3c6dad56c8414dca03e95c6e5ff3927544':
  Remove unused "host/Directories.h".
 2015-07-28 18:49:06 +00:00
Dan Albert 1ce9f0390c am d3e98f1c: am 29dc917b: am d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION." 
* commit 'd3e98f1c17c98d5de54b7555c31e9ce0400c6a2c':
  Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.
 2015-07-28 18:46:01 +00:00
Elliott Hughes 36af8c3c6d am f79ba085: am 7ecb919d: Merge "Remove unused "host/Directories.h"." 
* commit 'f79ba085c25c1a2b745985ebb3639e6658f25c2c':
  Remove unused "host/Directories.h".
 2015-07-28 15:27:22 +00:00
Elliott Hughes f79ba085c2 am 7ecb919d: Merge "Remove unused "host/Directories.h"." 
* commit '7ecb919dbaffe20c310367fd96a327d4f57adfd8':
  Remove unused "host/Directories.h".
 2015-07-28 15:07:40 +00:00
Elliott Hughes 7ecb919dba Merge "Remove unused "host/Directories.h"." 2015-07-28 14:55:06 +00:00
Elliott Hughes cd5875f716 Remove unused "host/Directories.h". 
There's no implementation of these functions.

Change-Id: Ic12286ccd1a392be32e5da67e5b7637bac4820f6
 2015-07-28 07:49:02 -07:00
Dan Albert d3e98f1c17 am 29dc917b: am d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION." 
* commit '29dc917b16f0522dfaf367a70ae99186344e1f0e':
  Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.
 2015-07-28 00:30:55 +00: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 3c133ddcdf am 4cdbb26c: am 86162e64: am b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB." 
* commit '4cdbb26ca2c0174c6846e1a8a9cf624390c616e9':
  Bump generic_arm64 system partition size to 1200 MB.
 2015-07-27 19:31:22 +00:00
Ying Wang 4cdbb26ca2 am 86162e64: am b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB." 
* commit '86162e6439e8035494b187efbf138d9cabae92fb':
  Bump generic_arm64 system partition size to 1200 MB.
 2015-07-27 19:19:15 +00:00
Ying Wang 86162e6439 am b1c0a86f: Merge "Bump generic_arm64 system partition size to 1200 MB." 
* commit 'b1c0a86f7a178a517caf2c815b20bda276935df9':
  Bump generic_arm64 system partition size to 1200 MB.
 2015-07-27 19:01:49 +00:00
Daichi Hirono 3ac678361e Merge "Let proguard keep classes/methods annotated with internal VisibleForTesting." 2015-07-27 19:00:12 +00:00
Ying Wang b1c0a86f7a Merge "Bump generic_arm64 system partition size to 1200 MB." 2015-07-27 18:48:35 +00:00