#6535 closed change (duplicate)

Ignore libadblockplus and libadblockplus-android files

Reported by: diegocarloslima Assignee: diegocarloslima
Priority: Unknown Milestone:
Module: Adblock-Plus-for-Chromium Keywords:
Cc: anton Blocked By:
Blocking: Platform: Android
Ready: no Confidential: no
Tester: Unknown Verified working: no
Review URL(s):

Description

Background

When building ABP Chromium, lots of files fetched from libadblockplus and libadblockplus-andoid dependencies show as unstaged files. This makes harder to use UI tools (e.g. SourceTree or GitKraken) and makes easier to add some of those files to the repository by mistake. Furthermore, it seems that it also can impact on sync calls, which can result in files being wiped and re-downloaded on each sync.

What to change

Ignore fetched files for libadblockplus and libadblockplus-android dependencies

Change History (3)

comment:1 Changed 20 months ago by diegocarloslima

For fixing that, 2 approaches comes into my mind:

  1. We could keep both dependencies directory structure as it is, and add the following ignore rules in third_party/.gitignore:
    /libadblockplus 
    !/libadblockplus/BUILD.gn 
    !/libadblockplus/download_ndk.py 
    !/libadblockplus/prepare_dependencies.py 
    /libadblockplus_android 
    !/libadblockplus_android/BUILD.gn 
    !/libadblockplus_android/prepare_build_tools.py 
    !/libadblockplus_android/proguard-adblock.txt 
    

This approach has the drawback to be prone to need more maintenance in the .gitignorefile

  1. We could check the dependencies inside a src folder (/third_party/libadblockplus/src and /third_party/libadblockplus-android/src) and add just 2 rules for the ignore file:
    /libadblockplus/src
    /libadblockplus_android/src
    

For me, this is the best option, since we just need to add 2 rules and this is also how its done in Chromium already for other dependencies.

comment:2 Changed 20 months ago by diegocarloslima

  • Owner set to diegocarloslima

comment:3 Changed 20 months ago by asmirnov

  • Resolution set to duplicate
  • Status changed from new to closed

Since i was not CCed and you did not pinged me about it i've duplicated it #6536.
I'm closing it as i've already pushed feature branch and merge request for #6536.

Note: See TracTickets for help on using tickets.