| Index: build/android/envsetup.sh | 
| diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh | 
| index cde22a88a458e7bdda159e32397c1f1a281e3561..3a3c6a7f9dd7bd9e79661169a0e39069f66e004a 100755 | 
| --- a/build/android/envsetup.sh | 
| +++ b/build/android/envsetup.sh | 
| @@ -148,9 +148,7 @@ DEFINES+=" remoting=0" | 
| DEFINES+=" p2p_apis=0" | 
| DEFINES+=" enable_touch_events=1" | 
| DEFINES+=" build_ffmpegsumo=0" | 
| -# TODO(bulach): use "shared_library" once the transition from executable | 
| -# is over. | 
| -DEFINES+=" gtest_target_type=executable" | 
| +DEFINES+=" gtest_target_type=shared_library" | 
| DEFINES+=" branding=Chromium" | 
|  | 
| export GYP_DEFINES="${DEFINES}" | 
|  |