| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'variables': { | 6   'variables': { | 
| 7     'content_shell_product_name': 'Content Shell', | 7     'content_shell_product_name': 'Content Shell', | 
| 8   }, | 8   }, | 
| 9   'targets': [ | 9   'targets': [ | 
| 10     { | 10     { | 
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 516             'shell/android/shell_view.cc', | 516             'shell/android/shell_view.cc', | 
| 517             'shell/android/shell_view.h', | 517             'shell/android/shell_view.h', | 
| 518           ], | 518           ], | 
| 519         }, | 519         }, | 
| 520         { | 520         { | 
| 521           'target_name': 'content_shell_apk', | 521           'target_name': 'content_shell_apk', | 
| 522           'type': 'none', | 522           'type': 'none', | 
| 523           'actions': [ | 523           'actions': [ | 
| 524             { | 524             { | 
| 525               'action_name': 'copy_base_jar', | 525               'action_name': 'copy_base_jar', | 
| 526               'inputs': ['<(PRODUCT_DIR)/chromium_base.jar'], | 526               'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'], | 
| 527               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.
     jar'], | 527               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.
     jar'], | 
| 528               'action': ['cp', '<@(_inputs)', '<@(_outputs)'], | 528               'action': ['cp', '<@(_inputs)', '<@(_outputs)'], | 
| 529             }, | 529             }, | 
| 530             { | 530             { | 
|  | 531               'action_name': 'copy_net_jar', | 
|  | 532               'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_net.jar'], | 
|  | 533               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.j
     ar'], | 
|  | 534               'action': ['cp', '<@(_inputs)', '<@(_outputs)'], | 
|  | 535             }, | 
|  | 536             { | 
|  | 537               'action_name': 'copy_media_jar', | 
|  | 538               'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_media.jar'], | 
|  | 539               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_media
     .jar'], | 
|  | 540               'action': ['cp', '<@(_inputs)', '<@(_outputs)'], | 
|  | 541             }, | 
|  | 542             { | 
| 531               'action_name': 'copy_content_jar', | 543               'action_name': 'copy_content_jar', | 
| 532               'inputs': ['<(PRODUCT_DIR)/chromium_content.jar'], | 544               'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_content.jar'], | 
| 533               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_conte
     nt.jar'], | 545               'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_conte
     nt.jar'], | 
| 534               'action': ['cp', '<@(_inputs)', '<@(_outputs)'], | 546               'action': ['cp', '<@(_inputs)', '<@(_outputs)'], | 
| 535             }, | 547             }, | 
| 536             { | 548             { | 
| 537               'action_name': 'copy_and_strip_so', | 549               'action_name': 'copy_and_strip_so', | 
| 538               'inputs': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'], | 550               'inputs': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'], | 
| 539               'outputs': ['<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_
     shell_content_view.so'], | 551               'outputs': ['<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_
     shell_content_view.so'], | 
| 540               'action': [ | 552               'action': [ | 
| 541                 '<!(/bin/echo -n $STRIP)', | 553                 '<!(/bin/echo -n $STRIP)', | 
| 542                 '--strip-unneeded',  # All symbols not needed for relocation. | 554                 '--strip-unneeded',  # All symbols not needed for relocation. | 
| 543                 '<@(_inputs)', | 555                 '<@(_inputs)', | 
| 544                 '-o', | 556                 '-o', | 
| 545                 '<@(_outputs)' | 557                 '<@(_outputs)' | 
| 546               ], | 558               ], | 
| 547             }, | 559             }, | 
| 548             { | 560             { | 
| 549               'action_name': 'content_shell_apk', | 561               'action_name': 'content_shell_apk', | 
| 550               'inputs': [ | 562               'inputs': [ | 
| 551                 '<(DEPTH)/content/shell/android/content_shell_apk.xml', | 563                 '<(DEPTH)/content/shell/android/content_shell_apk.xml', | 
| 552                 '<(DEPTH)/content/shell/android/AndroidManifest.xml', | 564                 '<(DEPTH)/content/shell/android/AndroidManifest.xml', | 
| 553                 '<!@(find shell/android/java -name "*.java")', | 565                 '<!@(find shell/android/java -name "*.java")', | 
| 554                 '<!@(find shell/android/res -name "*")', | 566                 '<!@(find shell/android/res -name "*")', | 
| 555                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar', | 567                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar', | 
|  | 568                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar', | 
|  | 569                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar', | 
| 556                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar', | 570                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar', | 
| 557                 '<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_cont
     ent_view.so', | 571                 '<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_cont
     ent_view.so', | 
| 558               ], | 572               ], | 
| 559               'outputs': [ | 573               'outputs': [ | 
| 560                 # Awkwardly, we build a Debug APK even when gyp is in | 574                 # Awkwardly, we build a Debug APK even when gyp is in | 
| 561                 # Release mode.  I don't think it matters (e.g. we're | 575                 # Release mode.  I don't think it matters (e.g. we're | 
| 562                 # probably happy to not codesign) but naming should be | 576                 # probably happy to not codesign) but naming should be | 
| 563                 # fixed. | 577                 # fixed. | 
| 564                 '<(PRODUCT_DIR)/ContentShell-debug.apk', | 578                 '<(PRODUCT_DIR)/ContentShell-debug.apk', | 
| 565               ], | 579               ], | 
| 566               'action': [ | 580               'action': [ | 
| 567                 'ant', | 581                 'ant', | 
| 568                 '-DPRODUCT_DIR=<(PRODUCT_DIR)', | 582                 '-DPRODUCT_DIR=<(PRODUCT_DIR)', | 
| 569                 '-buildfile', | 583                 '-buildfile', | 
| 570                 '<(DEPTH)/content/shell/android/content_shell_apk.xml', | 584                 '<(DEPTH)/content/shell/android/content_shell_apk.xml', | 
| 571               ] | 585               ] | 
| 572             } | 586             } | 
| 573           ], | 587           ], | 
| 574         }, | 588         }, | 
| 575       ], | 589       ], | 
| 576     }],  # OS=="android" | 590     }],  # OS=="android" | 
| 577   ] | 591   ] | 
| 578 } | 592 } | 
| OLD | NEW | 
|---|