diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-02-12 16:44:02 -0800 |
|---|---|---|
| committer | Siva Velusamy <vsiva@google.com> | 2014-02-12 16:44:02 -0800 |
| commit | 7dda780983ae6d1064bc9ef64973122772b3fe5d (patch) | |
| tree | 134d648d71be3e8c9f90e49634a5740dea2ba3d2 /build/tools.windows.atree | |
| parent | a77937f23970fc74391ebeb2079bc56e6779145e (diff) | |
| download | sdk-7dda780983ae6d1064bc9ef64973122772b3fe5d.zip sdk-7dda780983ae6d1064bc9ef64973122772b3fe5d.tar.gz sdk-7dda780983ae6d1064bc9ef64973122772b3fe5d.tar.bz2 | |
Revert "Remove monitor temporarily from sdk builds"
This reverts commit 0d723886ab5d3f7cf4ed2102be84fe482eeca3a0.
This breaks the windows build with the error:
make: *** No rule to make target `monitor', needed by `winsdk-tools'.
Diffstat (limited to 'build/tools.windows.atree')
| -rwxr-xr-x | build/tools.windows.atree | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/build/tools.windows.atree b/build/tools.windows.atree index 36a6feb..5e5e766 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -93,13 +93,12 @@ rm tools/zipalign bin/zipalign.exe strip tools/zipalign.exe # RCP Monitor. Remove linux stuff and replace by Windows files. -# Temporarily disabled: See b/8992787 -#rm tools/monitor -#rm tools/lib/monitor-x86 -#rm tools/lib/monitor-x86_64 -#sdk/monitor/monitor.bat tools/monitor.bat -#eclipse/monitor-win32.win32.x86/monitor tools/lib/monitor-x86 -#eclipse/monitor-win32.win32.x86_64/monitor tools/lib/monitor-x86_64 +rm tools/monitor +rm tools/lib/monitor-x86 +rm tools/lib/monitor-x86_64 +sdk/monitor/monitor.bat tools/monitor.bat +eclipse/monitor-win32.win32.x86/monitor tools/lib/monitor-x86 +eclipse/monitor-win32.win32.x86_64/monitor tools/lib/monitor-x86_64 # Copy the AVD & SDK Manager (aka avd/sdklauncher) to the root of the SDK as |