Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@ cmake_minimum_required(VERSION 3.4.1)
# Gradle automatically packages shared libraries with your APK.

add_library( # Sets the name of the library.
adblockclient-lib
adblockclient-lib

# Sets the library as a shared library.
SHARED
# Sets the library as a shared library.
SHARED

# Provides a relative path to your source file(s).
src/main/cpp/adblockclient-lib.cpp
src/main/cpp/third-party/ad-block/ad_block_client.cc
src/main/cpp/third-party/ad-block/cosmetic_filter.cc
src/main/cpp/third-party/ad-block/filter.cc
src/main/cpp/third-party/bloom-filter-cpp/BloomFilter.cpp
src/main/cpp/third-party/bloom-filter-cpp/hashFn.cpp
src/main/cpp/third-party/hashset-cpp/HashSet.cpp
)
# Provides a relative path to your source file(s).
src/main/cpp/adblockclient-lib.cpp
src/main/cpp/third-party/ad-block/ad_block_client.cc
src/main/cpp/third-party/ad-block/cosmetic_filter.cc
src/main/cpp/third-party/ad-block/filter.cc
src/main/cpp/third-party/bloom-filter-cpp/BloomFilter.cpp
src/main/cpp/third-party/bloom-filter-cpp/hashFn.cpp
src/main/cpp/third-party/hashset-cpp/HashSet.cpp
)

add_library( # Sets the name of the library.
https-bloom-lib
https-bloom-lib

# Sets the library as a shared library.
SHARED
# Sets the library as a shared library.
SHARED

# Provides a relative path to your source file(s).
src/main/cpp/https-bloom-lib.cpp
src/main/cpp/third-party/bloom_cpp/src/BloomFilter.cpp
)
# Provides a relative path to your source file(s).
src/main/cpp/https-bloom-lib.cpp
src/main/cpp/third-party/bloom_cpp/src/BloomFilter.cpp
)

# Searches for a specified prebuilt library and stores the path as a
# variable. Because CMake includes system libraries in the search path by
Expand All @@ -44,19 +44,19 @@ add_library( # Sets the name of the library.
# completing its build.

find_library( # Sets the name of the path variable.
log-lib
log-lib

# Specifies the name of the NDK library that
# you want CMake to locate.
log )
# Specifies the name of the NDK library that
# you want CMake to locate.
log)

# Specifies libraries CMake should link to your target library. You
# can link multiple libraries, such as libraries you define in this
# build script, prebuilt third-party libraries, or system libraries.

target_link_libraries( # Specifies the target library.
adblockclient-lib
adblockclient-lib

# Links the target library to the log library
# included in the NDK.
${log-lib} )
# Links the target library to the log library
# included in the NDK.
${log-lib})
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ class TestApplication : DuckDuckGoApplication() {

override fun configureDependencyInjection() {
DaggerTestAppComponent.builder()
.application(this)
.create(this)
.inject(this)
.application(this)
.create(this)
.inject(this)
}

// We don't need to actually use leak canary for tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ class BookmarksDaoTest {
@Before
fun before() {
db = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getContext(), AppDatabase::class.java)
.allowMainThreadQueries()
.build()
.allowMainThreadQueries()
.build()
dao = db.bookmarksDao()
}

Expand Down
Loading