Ying Wang 87108c8530 resolved conflicts for merge of 0f32d65d to mnc-dev-plus-aosp ...

Change-Id: I7da3ba971ccaf566be3e490846e5e306cdd2cf28

2015-08-01 11:01:00 -07:00

..

tools

am 5cf9df16: am 2ca0c6f9: Merge "Add clang.exe to Windows SDK build."

2015-06-25 21:46:02 +00:00

Android.mk

am ab748c01: Merge "Sample for percent support library." into lmp-mr1-ub-dev

2015-05-14 00:43:26 +00:00

build_android_stubs.mk

[DO NOT MERGE] Compile using Jack

2015-05-19 18:17:05 +02:00

optional.json

Optional library listing file.

2015-04-24 13:17:36 -07:00

product_sdk.mk

Remove unnecessary clang from product_sdk.mk.

2015-06-25 14:37:59 -07:00

sdk-android-arm64-v8a.atree

Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.

2014-08-19 09:33:45 -07:00

sdk-android-armeabi-v7a.atree

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

sdk-android-armeabi.atree

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

sdk-android-mips64.atree

Ability to generate SDK system-images for mips64

2015-05-01 16:50:27 +00:00

sdk-android-mips.atree

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

sdk-android-x86_64.atree

Move SDK system-image source.prop_templates in their own folder.

2014-06-14 21:31:13 -07:00

sdk-android-x86.atree

Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.

2014-06-20 08:49:37 -07:00

sdk-darwin-x86.atree

resolved conflicts for merge of 0f32d65d to mnc-dev-plus-aosp

2015-08-01 11:01:00 -07:00

sdk-linux-x86.atree

resolved conflicts for merge of 0f32d65d to mnc-dev-plus-aosp

2015-08-01 11:01:00 -07:00

sdk-windows-x86.atree

resolved conflicts for merge of 0f32d65d to mnc-dev-plus-aosp

2015-08-01 11:01:00 -07:00

sdk.atree

For RenderScript support lib use libblasV8.so instead of libblas.so

2015-07-27 17:09:45 -07:00

sdk.exclude.atree

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

windows_sdk_whitelist.mk

Merge "Allow libbase to be used on Windows."

2015-03-30 17:47:20 +00:00