On Thu, 2015-05-07 at 18:40 +0900, ???(Uze Choi) wrote: > Hi Erich, > > My request looks like slightly different from your understanding. > > Change-894 has merge issue now and you need to update it with different patch.
It'll definitely need to be rebased. There is an intent to do so. > When you update it, please include our today's works on android-api. (Change > 911, Change 910, Change 914 and so on.) > These commits are already merged into android-api branch. > If not, we need to figure out all difference in the base layer code between > android-api and master branch also. I was really hoping that you'd be willing to pull the Service differences over, because my attempts at merging last time (CA) and this time caused some pretty nasty issues with your code. Could you just cherry pick those reviews to master after 894 comes over? > > BR, Uze Choi > -----Original Message----- > From: Keane, Erich [mailto:erich.keane at intel.com] > Sent: Thursday, May 07, 2015 9:35 AM > To: uzchoi at samsung.com > Cc: Keany, Bernie; iotivity-dev at lists.iotivity.org; brian.warner at > linuxfoundation.org > Subject: Re: [dev] Base Android API patch has been pushed for review > > Responses inline: > > On Thu, 2015-05-07 at 09:28 +0900, ???(Uze Choi) wrote: > > Hi Berine/Tim > > > > I appreciate you your effort for android api working in base layer. > > Anyway, by today there will be couple of update from primitive > > services on android-api branch. > > Android-api branch is effectively closed as of this review. Any further > 'primative services' code should be done in a new review. > > > Please apply this change on this 894 commit by addon patch. > > > > We have a hard time for build check in android platform, As soon as > > possible, Jenkins buildboot system needs to check the android build > > together. (This is the request for IoTivity Infra team) > > We're working on that as we speak :) The Android build is enabled via the > build-script, but the build server needs gradle and the NDK installed > properly. > > > > Furthermore, I propose that android api should not be handled in a > > separate branch. > > Strictly, this is not feature, but platform support only. > > Every feature should consider it. > > Once this review goes in, android-api will be on master, so there will be no > 'separate brnach'. > > > > I was very hard to synchronize the code together with master branch. > > Whenever, CA code implemented in the CA branch, we need to check the > > code with that CA branch base layer code. > > And CA code was just into the master, we would have checked whether > > the service code aligned well to master branch again. > > I wish the android code need to be care from each feature code also > > not on the special android-api branch. > > > > BR, Uze Choi > > -----Original Message----- > > From: iotivity-dev-bounces at lists.iotivity.org [mailto:iotivity-dev- > > bounces at lists.iotivity.org] On Behalf Of Keany, Bernie > > Sent: Thursday, May 07, 2015 5:06 AM > > To: iotivity-dev at lists.iotivity.org > > Subject: [dev] Base Android API patch has been pushed for review > > > > Yesterday we submitted https://gerrit.iotivity.org/gerrit/#/c/894/ for > > review, this changeset brings the Android API work which has been in > > progress on the android-api branch onto the master branch. There are a > > large number of changes and some modifications which are still in > > process as a result of the merging of the CA branch onto master > > followed by the merge of the android-api onto master. We?ve added some > > reviewers but want to make sure that the community is aware of the > > patch incase you?d like to add yourself as a reviewer. > > > > As I mentioned, there are still some areas where final modifications > > are in progress and those areas relate to the changes that will need > > to be made in the services in order to use the Base API as well as > > remaining CA merge items regarding the BLE and wifi interfaces. Other > > than that the code is comple and ready for review/comment. Please add > > yourself if you?re interested in reviewing. > > > > Thanks, > > Bernie Keany > > _______________________________________________ > > iotivity-dev mailing list > > iotivity-dev at lists.iotivity.org > > https://lists.iotivity.org/mailman/listinfo/iotivity-dev > > > > _______________________________________________ > > iotivity-dev mailing list > > iotivity-dev at lists.iotivity.org > > https://lists.iotivity.org/mailman/listinfo/iotivity-dev > >
