Merge "Remove dependencies on external packages from features and sources"HEADplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1platform-tools-31.0.0platform-tools-30.0.5platform-tools-30.0.4platform-tools-30.0.3platform-tools-30.0.2platform-tools-30.0.1platform-tools-30.0.0platform-tools-29.0.6platform-tools-29.0.5platform-tools-29.0.4platform-tools-29.0.3platform-tools-29.0.2platform-tools-29.0.1android-wear-p-preview-2android-wear-o-preview-4android-wear-o-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-wear-8.1.0_r1android-wear-8.0.0_r2android-wear-8.0.0_r1android-wear-7.1.1_r1android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-vts-12.0_r1android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r1android-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-security-11.0.0_r49android-security-11.0.0_r1android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-s-v2-preview-1android-s-preview-1android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-r-beta-3android-r-beta-2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-platform-12.0.0_r1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r4android-platform-11.0.0_r3android-platform-11.0.0_r2android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-preview-4android-o-preview-3android-o-preview-2android-o-mr1-preview-2android-o-mr1-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-n-iot-preview-2android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-mainline-10.0.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-l-preview_r2android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-cts-4.4_r4android-cts-4.4_r1android-cts-12.0_r1android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r3android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r2android-9.0.0_r19android-9.0.0_r18android-9.0.0_r17android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11android-9.0.0_r10android-9.0.0_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r2.1android-4.3_r2android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-12.0.0_r9android-12.0.0_r8android-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r3android-12.0.0_r2android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r5android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r4android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android-11.0.0_r1android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r4android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r3android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r2android-10.0.0_r19android-10.0.0_r18android-10.0.0_r17android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1tools_r22.2tools_r22tools_r21simpleperf-releasesecurity-pi-releasesecurity-oc-releasesecurity-oc-mr1-releasesdk-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-platform-releasepie-gsipie-dr1-releasepie-dr1-devpie-devpie-cuttlefish-testingpie-cts-releasepie-b4s4-releasepie-b4s4-devoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-iot-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-mr1-1.2-iot-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseo-mr1-iot-preview-8o-mr1-iot-preview-7nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-wear-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-iot-releasenougat-dr1-releasenougat-devnougat-cts-releasendk-sysroot-r21n-iot-preview-4n-iot-preview-2master-soongmaster-cuttlefish-testing-releasemastermarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releasemain-cg-testing-releaselollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewkitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aospidea133-weekly-releaseidea133android12-tests-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-releaseandroid12-gsiandroid12-devandroid12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-platform-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-mainline-a-releaseandroid10-gsiandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-s-v2-preview-1android-s-beta-5android-s-beta-4

7 files changed, 337 insertions, 11 deletions

diff --git a/makefile/build.properties b/makefile/build.properties
index a231eef..95d2df6 100644
--- a/makefile/build.properties
+++ b/makefile/build.properties
@@ -13,8 +13,8 @@ build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
 # Build Properties from legacy build
 ######################
 
-ADT_JAR_FILENAME = com.android.ide.eclipse.adt_20.0.2.v201207191942-407447
-DDMS_JAR_FILENAME =  com.android.ide.eclipse.ddms_20.0.2.v201207191942-407447
+#ADT_JAR_FILENAME = com.android.ide.eclipse.adt_20.0.2.v201207191942-407447
+#DDMS_JAR_FILENAME =  com.android.ide.eclipse.ddms_20.0.2.v201207191942-407447
 
 STUDIO_ROOT_BINARY = com.motorola.studio.android.android_root
 
diff --git a/makefile/common.properties b/makefile/common.properties
index e69de29..e440d41 100644
--- a/makefile/common.properties
+++ b/makefile/common.properties
@@ -0,0 +1,35 @@
+studioFeatureName=com.motorola.studio.android.feature
+studioVersion=5.0.0
+studioLangpackVersion=3.0.0
+appvalidatorVersion=2.0.0
+appvalidatorUIVersion=2.0.0
+appvalidatorSDKVersion=2.0.0
+appvalidatorLangpackVersion=2.0.0
+platformVersion=3.2.0
+platformLangpackVersion=3.0.0
+studioFeatureVersion=${studioVersion}.${forceContextQualifier}
+appValidatorFeatureName=com.motorolamobility.preflighting.feature
+appValidatorFeatureVersion=${appvalidatorVersion}.${forceContextQualifier}
+appValidatorUIFeatureName=com.motorolamobility.preflighting.ui.feature
+appValidatorUIFeatureVersion=${appvalidatorUIVersion}.${forceContextQualifier}
+appValidatorSDKFeatureName=com.motorolamobility.preflighting.sdk.feature
+appValidatorSDKFeatureVersion=${appvalidatorSDKVersion}.${forceContextQualifier}
+
+eclipse.builder.path=${BASE_DIR}/env/eclipse
+#these are inside the plugins folder
+eclipse.builder.launcher=org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar
+eclipse.builder.pde=org.eclipse.pde.build_3.8.0.v20120523-1555
+#this is inside the features folder
+eclipse.builder.executable=org.eclipse.equinox.executable_3.6.0.v20120522-1813-7P7OG2BFLWUl7UmbVUO9iCm
+
+TCLKIT_PATH = ${BASE_DIR}/env/tclkit
+GIT_REPOSITORY_PATH = ${BASE_DIR}/env/code
+MAKEFILE = ${GIT_REPOSITORY_PATH}/android/makefile
+SOURCE_DIR = ${GIT_REPOSITORY_PATH}/android/src/
+INPUT_DIR = ${BASE_DIR}/input
+REPOSITORIES_DIR = ${INPUT_DIR}/repository
+BASE_REPOSITORIES_DIR = ${REPOSITORIES_DIR}/base
+EXTRA_REPOSITORIES_DIR = ${REPOSITORIES_DIR}/extra
+LANG_REPOSITORIES_DIR = ${REPOSITORIES_DIR}/lang
+
+motodev.keystore = ${MAKEFILE}/MOTODEV.keystore
diff --git a/makefile/setup_env b/makefile/setup_env
new file mode 100755
index 0000000..c478378
--- /dev/null
+++ b/makefile/setup_env
@@ -0,0 +1,290 @@
+#!/bin/bash
+# setup_env
+# Script for pulling down the MOTODEV plugins source, all dependencies, and building
+# If building on Windows with Cygwin or MingGW/Git Bash, use forward slash format
+
+
+
+# Required parameters
+# ===== BEGIN =====
+
+# Insert your build base here. This is where files will be downloaded and build
+export BUILD_BASE_PATH=/home/username/work/build_test
+
+# This is the path to the downloaded Eclipse installation
+export ECLIPSE_BASE_PATH=$BUILD_BASE_PATH/env/eclipse
+
+# Target OS. (WINDOWS, LINUX)
+#export BUILD_TARGET="WINDOWS"
+export BUILD_TARGET="LINUX"
+
+# =====  END  =====
+# Required parameters
+
+
+
+# It's OK if this fails due to existing
+mkdir $BUILD_BASE_PATH
+cd $BUILD_BASE_PATH
+mkdir ./env
+mkdir ./env/code
+#mkdir ./env/code/android
+#mkdir ./env/code/android/makefile
+#mkdir ./env/code/android/src
+#mkdir ./env/eclipse
+mkdir ./input
+mkdir ./input/repository
+mkdir ./input/repository/base
+
+
+# These will come from eclipse git repos
+mkdir ./input/repository/base/REPO_ECLIPSE_PLATFORM
+mkdir ./input/repository/base/REPO_BIRT
+mkdir ./input/repository/base/REPO_DATATOOLS
+mkdir ./input/repository/base/REPO_EMF_XSD_SDO
+mkdir ./input/repository/base/REPO_GEF
+mkdir ./input/repository/base/REPO_JDT
+mkdir ./input/repository/base/REPO_PDE
+mkdir ./input/repository/base/REPO_WTP
+mkdir ./input/repository/base/REPO_EGIT
+mkdir ./input/repository/base/REPO_MYLYN
+
+# This will come from eclipse svn
+mkdir ./input/repository/base/REPO_MAT
+
+# This will come from an archive or Eclipse git
+mkdir ./input/repository/base/REPO_SEQUOYAH
+
+# This will come from Google
+mkdir ./input/repository/base/REPO_ADT
+
+# These are set to get the revision used by MOTODEV. In some cases, it 
+# may be necessary to get the HEAD by removing the -b parameter
+cd ./input/repository/base
+
+if [ -f "REPO_ECLIPSE_PLATFORM.zip" ];
+then
+echo "REPO_ECLIPSE_PLATFORM.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/org.eclipse.platform.source-4.2.zip > REPO_ECLIPSE_PLATFORM.zip;
+fi
+
+if [ -f "REPO_BIRT.zip" ];
+then
+echo "REPO_BIRT.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/birt/downloads/drops/R-R1-4_2_0-201206131143/birt-updatesite-4_2_0.zip > REPO_BIRT.zip;
+fi
+
+if [ -f "REPO_DATATOOLS.zip" ];
+then
+echo "REPO_DATATOOLS.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/datatools/downloads/1.10/dtp-sdk_1.10.zip > REPO_DATATOOLS.zip;
+fi
+
+if [ -f "REPO_EMF_XSD_SDO.zip" ];
+then
+echo "REPO_EMF_XSD_SDO.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.8.0/R201206080554/emf-xsd-Update-2.8.0.zip > REPO_EMF_XSD_SDO.zip;
+fi
+
+if [ -f "REPO_GEF.zip" ];
+then
+echo "REPO_GEF.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/tools/gef/downloads/drops/3.8.0/R201206112118/GEF-ALL-3.8.0.zip > REPO_GEF.zip;
+fi
+
+if [ -f "REPO_JDT.zip" ];
+then
+echo "REPO_JDT.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/org.eclipse.jdt.source-4.2.zip > REPO_JDT.zip;
+fi
+
+if [ -f "REPO_PDE.zip" ];
+then
+echo "REPO_PDE.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/org.eclipse.pde.source-4.2.zip > REPO_PDE.zip;
+fi
+
+if [ -f "REPO_WTP.zip" ];
+then
+echo "REPO_WTP.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/webtools/downloads/drops/R3.4.0/R-3.4.0-20120612174739/wtp4x-repo-R-3.4.0-20120612174739.zip > REPO_WTP.zip;
+fi
+
+if [ -f "REPO_MAT.zip" ];
+then
+echo "REPO_MAT.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/mat/1.1.1/MemoryAnalyzer-1.1.1.201108240735.zip > REPO_MAT.zip;
+fi
+
+if [ -f "REPO_SEQUOYAH.zip" ];
+then
+echo "REPO_SEQUOYAH.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/sequoyah/downloads/drops/2.1/2.1.1.N20120718-0509/org.eclipse.sequoyah.feature.2.1.1.N20120718-0509.zip > REPO_SEQUOYAH.zip;
+fi
+
+if [ -f "REPO_EGIT.zip" ];
+then
+echo "REPO_EGIT.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/egit/updates-2.0/org.eclipse.egit.repository-2.0.0.201206130900-r.zip > REPO_EGIT.zip;
+fi
+
+if [ -f "REPO_MYLYN.zip" ];
+then
+echo "REPO_MYLYN.zip exists. Skipping.";
+else
+curl http://ftp.osuosl.org/pub/eclipse/mylyn/drops/3.8.0/v20120612-0600/mylyn-3.8.0.v20120612-0600.zip > REPO_MYLYN.zip;
+fi
+
+if [ -f "REPO_ADT.zip" ];
+then
+echo "REPO_ADT.zip exists. Skipping.";
+else
+curl http://dl.google.com/android/ADT-20.0.3.zip > REPO_ADT.zip;
+fi
+
+# call unzip -q if it exists on all the downloaded repos
+# unzip -q REPO_EGIT.zip -d ./REPO_EGIT
+if ! [ -f "./REPO_ECLIPSE_PLATFORM/artifacts.jar" ];
+then 
+unzip -q REPO_ECLIPSE_PLATFORM.zip -d ./REPO_ECLIPSE_PLATFORM;
+fi
+
+if ! [ -f "./REPO_BIRT/artifacts.jar" ];
+then 
+unzip -q REPO_BIRT.zip -d ./REPO_BIRT;
+fi
+
+if ! [ -f "./REPO_EMF_XSD_SDO/artifacts.jar" ];
+then 
+unzip -q REPO_EMF_XSD_SDO.zip -d ./REPO_EMF_XSD_SDO;
+fi
+
+if ! [ -f "./REPO_JDT/artifacts.jar" ];
+then 
+unzip -q REPO_JDT.zip -d ./REPO_JDT;
+fi
+
+if ! [ -f "./REPO_PDE/artifacts.jar" ];
+then 
+unzip -q REPO_PDE.zip -d ./REPO_PDE;
+fi
+
+if ! [ -f "./REPO_WTP/artifacts.jar" ];
+then 
+unzip -q REPO_WTP.zip -d ./REPO_WTP;
+fi
+
+if ! [ -f "./REPO_MAT/artifacts.jar" ];
+then 
+unzip -q REPO_MAT.zip -d ./REPO_MAT;
+fi
+
+if ! [ -f "./REPO_SEQUOYAH/artifacts.jar" ];
+then 
+unzip -q REPO_SEQUOYAH.zip -d ./REPO_SEQUOYAH;
+fi
+
+if ! [ -f "./REPO_EGIT/artifacts.jar" ];
+then 
+unzip -q REPO_EGIT.zip -d ./REPO_EGIT;
+fi
+
+if ! [ -f "./REPO_MYLYN/artifacts.jar" ];
+then 
+unzip -q REPO_MYLYN.zip -d ./REPO_MYLYN;
+fi
+
+if ! [ -f "./REPO_ADT/site.xml" ];
+then 
+unzip -q REPO_ADT.zip -d ./REPO_ADT;
+fi
+
+# Get the MOTODEV plugins code
+cd $BUILD_BASE_PATH
+cd ./env/code
+git clone https://android.googlesource.com/platform/tools/motodev.git
+mv motodev/ android
+
+# Get the eclipse SDK + delta pack
+cd $BUILD_BASE_PATH
+if [ "$BUILD_TARGET" == "WINDOWS" ];
+then
+	if [ -f "eclipse-SDK-4.2-win32-x86_64.zip" ];
+	then
+	echo "eclipse-SDK-4.2-win32-x86_64.zip exists. Skipping.";
+	else
+	curl http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-SDK-4.2-win32-x86_64.zip > eclipse-SDK-4.2-win32-x86_64.zip;
+	fi
+
+	if ! [ -f "./env/eclipse/artifacts.xml" ];
+	then 
+	unzip -q eclipse-SDK-4.2-win32-x86_64.zip -d ./env;
+	fi
+elif [ "$BUILD_TARGET" == "LINUX" ];
+then
+	if [ -f "eclipse-SDK-4.2-linux-gtk-x86_64.tar.gz" ];
+	then
+	echo "eclipse-SDK-4.2-linux-gtk-x86_64.tar.gz exists. Skipping.";
+	else
+	curl http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-SDK-4.2-linux-gtk-x86_64.tar.gz > eclipse-SDK-4.2-linux-gtk-x86_64.tar.gz;
+	fi
+
+	if ! [ -f "./env/eclipse/artifacts.xml" ];
+	then 
+	tar -xcf eclipse-SDK-4.2-linux-gtk-x86_64.tar.gz -C ./env
+	fi
+fi
+
+if [ -f "eclipse-4.2-delta-pack.zip" ];
+then
+echo "eclipse-4.2-delta-pack.zip exists. Skipping.";
+else
+curl http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/eclipse-4.2-delta-pack.zip > eclipse-4.2-delta-pack.zip;
+fi
+
+unzip -q -o eclipse-4.2-delta-pack.zip -d ./env
+
+# These two are in an incompatible format
+cd $BUILD_BASE_PATH
+mkdir ./TEMP
+
+if ! [ -f "$BUILD_BASE_PATH/TEMP/REPO_DATATOOLS/eclipse/notice.html" ];
+then
+unzip -q ./input/repository/base/REPO_DATATOOLS.zip -d ./TEMP/REPO_DATATOOLS;
+fi
+
+if ! [ -f "$BUILD_BASE_PATH/input/repository/base/REPO_DATATOOLS/artifacts.jar" ];
+then 
+java -jar $ECLIPSE_BASE_PATH/plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -metadataRepository file://$BUILD_BASE_PATH/input/repository/base/REPO_DATATOOLS -artifactRepository file://$BUILD_BASE_PATH/input/repository/base/REPO_DATATOOLS -source $BUILD_BASE_PATH/TEMP/REPO_DATATOOLS/eclipse -compress -publishArtifacts ;
+fi
+
+if ! [ -f "$BUILD_BASE_PATH/TEMP/REPO_GEF/eclipse/plugins/org.eclipse.gef_3.8.0.201206112118.jar" ];
+then
+unzip -q ./input/repository/base/REPO_GEF.zip -d ./TEMP/REPO_GEF ;
+fi
+
+if ! [ -f "$BUILD_BASE_PATH/input/repository/base/REPO_GEF/artifacts.jar" ];
+then 
+java -jar $ECLIPSE_BASE_PATH/plugins/org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -metadataRepository file://$BUILD_BASE_PATH/input/repository/base/REPO_GEF -artifactRepository file://$BUILD_BASE_PATH/input/repository/base/REPO_GEF -source $BUILD_BASE_PATH/TEMP/REPO_GEF/eclipse -compress -publishArtifacts ;
+fi
+
+# Now that everything is in place, create these two variables
+export ADT_JAR_FILENAME=`ls input/repository/base/REPO_ADT/plugins | grep eclipse.adt_ | sed "s/.jar//"`
+export DDMS_JAR_FILENAME=`ls input/repository/base/REPO_ADT/plugins | grep eclipse.ddms_ | sed "s/.jar//"`
+
+# Run the eclipse to build the plugins
+$ECLIPSE_BASE_PATH/eclipse -nosplash -application org.eclipse.ant.core.antRunner -data $BUILD_BASE_PATH/env/workspace_product -buildfile $BUILD_BASE_PATH/env/code/android/makefile/studioBuild.xml -debug
+# Add these items to the build command line if you want a log file
+#-logger org.apache.tools.ant.XmlLogger -logfile $BUILD_BASE_PATH/log.xml
+
diff --git a/makefile/studioBuild.xml b/makefile/studioBuild.xml
index 5b09735..f0b6dea 100644
--- a/makefile/studioBuild.xml
+++ b/makefile/studioBuild.xml
@@ -444,6 +444,11 @@
 		<concat destfile="${buildDirectory}/build.properties" binary="yes">
 			<fileset dir="${buildDirectory}/" includes="*.properties" />
 		</concat>
+		
+		<!-- <echoproperties destfile="${buildDirectory}/build.properties" >
+			<property name="ADT_JAR_FILENAME" value="${env.ADT_JAR_FILENAME}"/>
+			<property name="DDMS_JAR_FILENAME" value="${env.DDMS_JAR_FILENAME}"/>
+		</echoproperties> -->
 	</target>
 
 
diff --git a/src/features/feature/feature.xml b/src/features/feature/feature.xml
index c348f9d..cf4ce7e 100644
--- a/src/features/feature/feature.xml
+++ b/src/features/feature/feature.xml
@@ -30,7 +30,6 @@
          version="0.0.0"/>

 

    <requires>

-      <import feature="biz.junginger.rss.eclipse.RssPlugin.feature" version="1.0.0" match="equivalent"/>

       <import feature="com.android.ide.eclipse.adt" version="15.0.0" match="greaterOrEqual"/>

       <import feature="com.android.ide.eclipse.hierarchyviewer" version="15.0.0" match="greaterOrEqual"/>

       <import feature="com.android.ide.eclipse.ddms" version="15.0.0" match="greaterOrEqual"/>

@@ -57,7 +56,7 @@
       <import feature="org.eclipse.wst.xml_ui.feature" version="3.2.0" match="greaterOrEqual"/>

       <import feature="org.eclipse.wst.xsl.feature" version="1.1.0" match="greaterOrEqual"/>

       <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>

-      <import feature="net.certiv.proguarddt.feature" version="0.8.0" match="greaterOrEqual"/>

+<!--      <import feature="net.certiv.proguarddt.feature" version="0.8.0" match="greaterOrEqual"/> -->

       <import feature="org.eclipse.epp.mpc" version="1.1.1" match="greaterOrEqual"/>

    </requires>

 

@@ -96,12 +95,12 @@
          version="0.0.0"

          unpack="false"/>

 

-   <plugin

+<!--   <plugin

          id="com.motorola.studio.android.tooldocs.studio.helpbase"

          download-size="0"

          install-size="0"

          version="0.0.0"

-         unpack="false"/>

+         unpack="false"/> -->

 

    <plugin

          id="com.motorola.studio.android.remote"

diff --git a/src/features/preflighting.ui/feature.xml b/src/features/preflighting.ui/feature.xml
index 624b966..48fc161 100644
--- a/src/features/preflighting.ui/feature.xml
+++ b/src/features/preflighting.ui/feature.xml
@@ -33,12 +33,12 @@
          version="0.0.0"

          unpack="false"/>

 

-   <plugin

+ <!--  <plugin

          id="com.motorolamobility.preflighting.tooldocs.validator.helpbase"

          download-size="0"

          install-size="0"

          version="0.0.0"

-         unpack="false"/>

+         unpack="false"/> -->

 

    <plugin

          id="com.motorola.studio.android.common"

diff --git a/src/plugins/android/src/com/motorola/studio/android/perspective/MotodevStudioAndroidPerspective.java b/src/plugins/android/src/com/motorola/studio/android/perspective/MotodevStudioAndroidPerspective.java
index 843aec9..c8f4288 100644
--- a/src/plugins/android/src/com/motorola/studio/android/perspective/MotodevStudioAndroidPerspective.java
+++ b/src/plugins/android/src/com/motorola/studio/android/perspective/MotodevStudioAndroidPerspective.java
@@ -56,8 +56,6 @@ public class MotodevStudioAndroidPerspective extends JavaPerspectiveFactory
     private static String VIEW_SNIPPETS =
             "org.eclipse.wst.common.snippets.internal.ui.SnippetsView";
 
-    private static String VIEW_RSS = "biz.junginger.newsfeed.eclipse.FeedView";
-
     // DDMS Views
 
     private static String DDMSVIEW_EMULATOR_CONTROL =
@@ -149,7 +147,6 @@ public class MotodevStudioAndroidPerspective extends JavaPerspectiveFactory
 
         IFolderLayout right = layout.createFolder("right", IPageLayout.RIGHT, 0.6f, editorArea);
         right.addView(VIEW_ANDROID_EMULATOR);
-        right.addView(VIEW_RSS);
 
         IFolderLayout bottomMiddle =
                 layout.createFolder("bottomMiddle", IPageLayout.BOTTOM, 0.59f, editorArea);