diff options
| author | Stephen Hines <srhines@google.com> | 2013-08-07 13:18:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-07 13:18:55 -0700 |
| commit | 0aaada25aa265e3c3e219ea6b351a646e077dc17 (patch) | |
| tree | f09c0a6e4bacdca17fda422e1496f6eba6d8c7c9 /build | |
| parent | 08f1ee33a1e1cb3ebfea3cb342b2d9fb29164d1f (diff) | |
| parent | d18bec202bf840aba8996c430a6fe7ba9af19a15 (diff) | |
| download | android_development-0aaada25aa265e3c3e219ea6b351a646e077dc17.tar.gz android_development-0aaada25aa265e3c3e219ea6b351a646e077dc17.tar.bz2 android_development-0aaada25aa265e3c3e219ea6b351a646e077dc17.zip | |
am d18bec20: am 6ee70b1c: am 4483ade6: Add frameworks/rs and bcc_compat to windows SDK whitelist.
* commit 'd18bec202bf840aba8996c430a6fe7ba9af19a15':
Add frameworks/rs and bcc_compat to windows SDK whitelist.
Diffstat (limited to 'build')
| -rw-r--r-- | build/sdk-windows-x86.atree | 6 | ||||
| -rw-r--r-- | build/tools/windows_sdk.mk | 1 | ||||
| -rw-r--r-- | build/windows_sdk_whitelist.mk | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree index 44b7fcba3..97f29a263 100644 --- a/build/sdk-windows-x86.atree +++ b/build/sdk-windows-x86.atree @@ -68,11 +68,13 @@ lib/libclang.dll strip build-tools/${PLATFORM_NAME}/libcl #bcc not yet compiled on windows rm build-tools/${PLATFORM_NAME}/libbcc.so -#lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/libbcc.dll +lib/libbcc.dll strip build-tools/${PLATFORM_NAME}/libbcc.dll rm build-tools/${PLATFORM_NAME}/libbcinfo.so -#lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/libbcinfo.dll +lib/libbcinfo.dll strip build-tools/${PLATFORM_NAME}/libbcinfo.dll +rm build-tools/${PLATFORM_NAME}/bcc_compat +bin/bcc_compat.exe strip build-tools/${PLATFORM_NAME}/bcc_compat.exe ############################################################################## diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk index aa5641b6b..9bd95093f 100644 --- a/build/tools/windows_sdk.mk +++ b/build/tools/windows_sdk.mk @@ -32,6 +32,7 @@ include $(TOPDIR)sdk/build/windows_sdk_tools.mk # the topdir/development directory and are somehow platform-dependent. WIN_TARGETS := \ aapt adb aidl \ + bcc_compat \ etc1tool \ dexdump dmtracedump \ fastboot \ diff --git a/build/windows_sdk_whitelist.mk b/build/windows_sdk_whitelist.mk index 568720e03..f2f4d8e53 100644 --- a/build/windows_sdk_whitelist.mk +++ b/build/windows_sdk_whitelist.mk @@ -47,6 +47,7 @@ subdirs += \ frameworks/base \ frameworks/compile \ frameworks/native \ + frameworks/rs \ system/core/adb \ system/core/fastboot \ system/core/libcutils \ |